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

58 Commits

Author SHA1 Message Date
Alex
eee546df06
Item battle effect refactor (#7857) 2025-10-12 08:59:33 +02:00
AlexOn1ine
870b93aad9 06/10/25 Master to upcoming merge 2025-10-06 19:42:42 +02:00
Eduardo Quezada
13f392987a
Fix some failed and assume fail tests with GEN_LATEST = GEN_5 (#7735) 2025-10-02 13:27:06 +02:00
khbsd
e385c7f59f
feat: change defines in constants/abilities.h to an enum (#7006) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-09-29 21:35:09 +02:00
AlexOn1ine
a4470cac2c Master to upcoming merge 2025-09-27 22:42:53 +02:00
Bassoonian
512471268e
Fix Salt Cure in double battles (#7797) 2025-09-25 16:59:39 +02:00
hedara90
27b542466f
Fix Flame Burst timeout if primary target is fainted (#7793) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-09-25 10:39:56 +02:00
AlexOn1ine
bc84e6656d Master to upcoming merge 2025-09-17 20:18:51 +02:00
Alex
6aead97a37
Fix incorrect wrap turn amount (#7667) 2025-09-08 11:53:05 +02:00
grintoul
a2e1835993
Separates FRB and FRZ animations (#7611) 2025-08-28 19:07:08 +02:00
AlexOn1ine
ce52d83343 25/08/25 Master merge 2025-08-25 17:30:38 +02:00
Eduardo Quezada
8febd24604
Added missing Move Effect TODO tests - Volume F (#7605) 2025-08-23 22:25:19 +02:00
Eduardo Quezada
f009550137
Added Ability TODO tests - Volume C (#7562) 2025-08-22 20:24:26 +02:00
AlexOn1ine
bd919e3219 11/08/25 Master to upcoming merge 2025-08-11 08:31:12 +02:00
Alex
7de3663f38
Fixes Life Orb still activating if move was absorbed (#7521) 2025-08-10 16:58:36 +02:00
Eduardo Quezada
0b299b3ffd
Fixed most failed tests with GEN_LATEST GEN_8 (#7498) 2025-08-08 09:44:12 +02:00
AlexOn1ine
bc73f4654b merge master 31/07/25 2025-08-01 12:18:11 +02:00
PhallenTree
01105171a3
Fixes Magnet Rise when user is Rooted/Smacked Down (#7449) 2025-07-31 19:30:50 +02:00
AlexOn1ine
90eef35715 master merge 2025-07-19 17:01:18 +02:00
Alex
73a2e5104e
Bugfixes for Knock Off, Cover, Thief, Ceaseless Edge and Stone Axe (#7326) 2025-07-14 21:34:21 +02:00
Nephrite
a1e67572b6
Replaces STATUS2 usage with volatiles in code (#7262) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-07-11 22:53:49 +02:00
Bassoonian
1a6ed20713
Add dedicated getter functions for Pokémon types and abilities (#7043) 2025-06-03 22:05:22 +02:00
Hedara
90aed43c27 Merge branch 'master' into master-upcoming 
Conflicts:
	.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
	.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
	.github/ISSUE_TEMPLATE/03_feature_requests.yaml
	.github/ISSUE_TEMPLATE/04_other_errors.yaml
	.github/pull_request_template.md
	src/battle_controller_player.c
	src/battle_main.c
	src/battle_script_commands.c
	src/battle_util.c
	src/data/graphics/pokemon.h
	src/data/pokemon/species_info/gen_9_families.h
	test/battle/ability/flower_veil.c
	test/battle/ability/sweet_veil.c
	test/battle/ability/synchronize.c
	test/battle/ability/water_bubble.c
	test/battle/move_effect/fell_stinger.c
	test/battle/move_effect/level_damage.c
	test/battle/move_effect/magic_room.c
	test/battle/move_effect/me_first.c
	test/battle/move_effect/sky_drop.c
	test/battle/move_effect/smack_down.c
	test/battle/move_effect/wish.c
	test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c
 2025-05-22 15:41:08 +02:00
Eduardo Quezada
6711df36a3
Create missing ability and move effect test files (#6845) 2025-05-16 12:20:44 +02:00
Eduardo Quezada
3056909286
Added weather accuracy move flags (#6857) 2025-05-16 07:58:40 +02:00
AlexOn1ine
40bf9ae087 conflicts 2025-05-03 10:26:07 +02:00
Eduardo Quezada
d2a4b5ef84
Changed Tackle for Scratch in tests (#6730) 2025-04-30 17:18:52 -04:00
AlexOn1ine
e246b20e72 27/04/25 Master to upcoming merge 2025-04-27 09:50:25 +02:00
Alex
72839fc002
Fixes Bug Bite eaten berry not ignoring Unnerve (#6666) 2025-04-22 00:38:39 +02:00
AlexOn1ine
e2e012c3a9 conflicts 2025-04-21 15:50:57 +02:00
Eduardo Quezada
4e7fa359ef
Fixed LGPE move test fail with B_UPDATED_MOVE_DATA to GEN_7 (#6657) 2025-04-21 14:48:49 +02:00
AlexOn1ine
5ee5aa796a merge rhh/upcoming 2025-02-12 21:01:21 +01:00
Eduardo Quezada
a2ad5d2ca3
Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes (#6210) 2025-02-09 21:54:03 +01:00
AlexOn1ine
f2bd88a7f9 EndTurnEffectsOrder Refactor 2025-02-09 13:48:08 +01:00
Eduardo Quezada
ed505cfb5f Merge branch '_RHH/master' into _RHH/upcoming 2025-01-21 19:32:51 -03:00
Alex
b2f2a8c9fb
Fixes Rapid Spin / Toxic Debris interaction (#6023) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-01-21 21:43:54 +01:00
Eduardo Quezada
9669a0554d
Encapsulate move data (#5852) 2025-01-01 20:34:33 +01:00
Hedara
2088f2a12d Merge branch 'master' into master-upcoming 2024-12-29 21:43:07 +01:00
Eduardo Quezada
433058edc1
Added missing Move Effect TODO tests - Volume D (#5887) 2024-12-29 14:27:08 +01:00
Eduardo Quezada
3bc4126558 Merge branch '_RHH/master' into _RHH/upcoming 2024-12-28 15:28:07 -03:00
Alex
8edf14423a
Refactors argument into a union (#5853) 
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-12-23 15:51:35 -03:00
Alex
f61a0f6a30
Sheer Force fix and move effect cleanup (#5812) 2024-12-21 19:45:50 +01:00
Eduardo Quezada
53aebc34dd Merge branch '_RHH/master' into _RHH/upcoming 2024-12-20 20:48:13 -03:00
PhallenTree
f4a0cc0055
Adds Thief/Covet config to send stolen item to bag and Pickup config to pickup user's item in wild battles (#5829) 2024-12-19 13:51:03 +01:00
AlexOn1ine
97b30cb712 simultaneous hp reduction 2024-11-23 08:35:01 +01:00
kittenchilly
db24128ee3
Update battle messages to Gen 5+ standards (#3240) 
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-10-21 14:52:45 -03:00
psf
2597d8a35a
Updated species defines (#5075) 
* First version of new defines

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Removed old defines

* Removed old defines

* Removed old defines and cleaned up some macros

* Undid changes to documentation
Deleted unused defines
Updated defines
Fixed tests
fixed docs

* moved note to top per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#discussion_r1783641599

* fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#pullrequestreview-2341613591
 2024-10-02 18:24:57 -03:00
Alex
42c43a3f8f
Adds Commander and Order Up (#5246) 
* Adds Commander

* review points

* new line

* correction

* regression / double targeting still broken

* fix wrong target order

* transform fixes

* haze test

* fixes, tests

* bring back wrongly removed else if case

* Eject Pack / Button test + fix

* red card fix

* test fixes

* Fixes Tatsu being hit by multi hit move

* change transform check

* fix test + revert change

* Fix Tatsugiri attacking after freed up from Dozo in the same turn

* Dragon Darts tests

* fix test

* review comments

* assumtion in wrong file

* Order Up test fixes

---------

Co-authored-by: hedara90 <90hedara@gmail.com>
 2024-09-29 22:45:50 +02:00
Eduardo Quezada
98eb4e5027 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	asm/macros/battle_script.inc
#	include/constants/battle_string_ids.h
#	src/battle_ai_switch_items.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/frontier_util.c
#	test/battle/ai/ai.c
 2024-07-19 09:20:05 -04:00
fakuzatsu
0625c90277
fix tests when B_USE_FROSTBITE is TRUE (#4986) 2024-07-17 23:23:52 +02:00