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

141 commits

Author SHA1 Message Date
Bassoonian
9c9a1fb831 Allow for healing with items 2023-04-22 19:18:10 +02:00
AgustinGDLV
2eabcea86e
Battle Item Refactor (#2902) 
* items that can be used in battle now use battlescripts
* removed ExecuteTableBasedItemEffect_
* taught AI how to use items, removed AI_itemtype/flag
* X-Items store stages raised in holdEffectParam
* USE_ITEM in tests
 2023-04-14 19:25:50 +01:00
Eduardo Quezada
958bc34cdf Fixed AI not considering Hidden Abilities in its team during switching logic 2023-04-14 09:42:48 -04:00
Eduardo Quezada D'Ottone
2658fe32c2
Removed ITEM_HAS_EFFECT (#2840) 2023-03-23 10:02:32 +01:00
Eduardo Quezada
9917f5cc8b Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 
# Conflicts:
#	Makefile
#	include/constants/pokemon.h
#	include/pokemon.h
#	make_tools.mk
#	src/battle_ai_script_commands.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/party_menu.c
#	src/pokemon.c
#	src/trade.c
#	src/trainer_pokemon_sprites.c
 2023-03-03 11:00:50 -03:00
Eduardo Quezada
079ca8ab29 Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarification 2023-02-24 07:53:02 -03:00
DizzyEggg
6cdca24c31 use forced switch battler bit 2023-02-16 21:58:00 +01:00
DizzyEggg
d7f68a3893 IsAceMon - not isAceMon 2023-02-16 15:57:15 +01:00
DizzyEggg
896b575c07 Fix volt switch breaking ace pokemon 2023-02-08 12:42:38 +01:00
Eduardo Quezada
749225ace1 Matching merge from upstream pret 
# Conflicts:
#	graphics/interface/menu_info.png
#	include/pokemon.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_mons.c
#	src/battle_anim_water.c
#	src/battle_controller_opponent.c
#	src/battle_gfx_sfx_util.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
 2023-01-20 12:31:54 -03:00
GriffinR
18384894e0
Merge pull request #1822 from AsparagusEduardo/pret/doc/typesEggGroups 
Made Types and Egg Groups into arrays
 2023-01-15 00:27:20 -05:00
GriffinR
5b3596108d Add some missing PARTY_SIZE usage 2023-01-12 10:51:20 -05:00
Eduardo Quezada
e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124 
# Conflicts:
#	include/battle.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_dome.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/battle_tower.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
 2022-11-24 15:36:00 -03:00
Eduardo Quezada
7327be6f9e Made Types and Egg Groups into arrays 2022-11-22 17:05:25 -03:00
Eduardo Quezada
3ed485632f Renamed gBaseStats to gSpeciesInfo 2022-10-24 17:01:48 -03:00
ghoulslash
add3625589 fix natural cure, shed skin, early bird check in ShouldSwitchIfGameStatePrompt 2022-09-18 22:47:30 -04:00
Eduardo Quezada D'Ottone
293a880238
Apply suggestions from code review 2022-09-18 00:50:21 -03:00
Ct11217
5f74781a7d Remove ACE_POKEMON_FUNCTIONALITY 2022-09-17 17:44:50 -06:00
Eduardo Quezada
6b79c7772c Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909 
# Conflicts:
#	src/battle_interface.c
 2022-09-16 11:56:50 -03:00
ghoulslash
95a3ead254 styling fix 2022-09-15 22:10:39 -04:00
ghoulslash
20190ac85a fix ai switch semi invulnerable 2022-09-15 18:34:15 -04:00
ghoulslash
354a8256e4
Merge pull request #2226 from Porygon23/AI-Logic-Updates 
Added corner case logic for AI Switching.
 2022-09-15 17:56:35 -04:00
Eduardo Quezada
de32940fdf Further removed trailing whitespaces 2022-09-13 16:26:36 -03:00
Ct11217
96d190f5ad Updated Toxic Status Counter 2022-09-12 20:39:21 -06:00
Eduardo Quezada
5403cd036e Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	include/battle.h
#	include/battle_controllers.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2022-09-02 23:24:08 -04:00
Porygon23
ba6aad5bcc
Merge branch 'master' into AI-Logic-Updates 2022-09-02 14:44:47 -06:00
Eduardo Quezada
99fbad92e2 IS_BATTLER_OF_TYPE 2022-08-27 02:50:55 -04:00
Eduardo Quezada
1f0a952546 Usage of BATTLE_OPPOSITE 2022-08-27 01:44:39 -04:00
Eduardo Quezada
15d611ba65 Usage of BATTLE_PARTNER 2022-08-27 01:26:13 -04:00
Eduardo Quezada
09fd393f97 Replaced instances of power == 0 with IS_MOVE_STATUS + fixed Wonder Skin 2022-08-23 22:38:35 -04:00
Ct11217
67f473f38b Fixed recommended issues. 
Added additional comments.
Reordered switching ladder in ShouldSwitch() function.
Functions that can specify a specific party mon to switch into need to come first.
 2022-08-23 19:49:54 -06:00
Ct11217
a4b53126f6 Added AI_FLAG_ACE_POKEMON 
When this flag is set, the trainer will have an "Ace" pokemon that will
always be sent out last.
If this flag is set, the last Pokemon in the party will be considered the
"Ace" Pokemon.

This is similar to the gym leader functionality found in Sword & Shield.
 2022-08-17 18:23:12 -06:00
Ct11217
bb978764f3 Fixed recommended changes 
Added additional double battle logic for yawn
 2022-08-13 00:39:44 -06:00
Ct11217
7378d1099b Removed AI_GetAbility 
Misc cleanup
 2022-08-12 15:21:25 -06:00
Ct11217
b95e450cb6 Added corner case logic for AI Switching. 
1. Refactor Perish Song
2. Yawn
3. Secondary Damage (Leech Seed, Cursed etc).
4. Added Preliminary logic to help AI be smarter against semi-invulnerable

Added AI logic regarding abilities that benefit from switching
1. Natural Cure
2. Regenerator
 2022-08-11 22:48:36 -06:00
ExpoSeed
49da2ee53f Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION 2022-08-02 00:15:55 -05:00
Eduardo Quezada
f3bebcd12c Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 
# Conflicts:
#	include/battle_anim.h
#	include/global.h
#	include/pokemon.h
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-22 22:57:02 -04:00
Eduardo Quezada D'Ottone
e791cf90ad Merge tag 'pretmaster' into BE_pretmerge2 
# Conflicts:
#	data/battle_anim_scripts.s
#	include/battle_anim.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/battle_main.h
#	include/battle_setup.h
#	include/constants/battle_anim.h
#	include/constants/battle_string_ids.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_fire.c
#	src/battle_anim_normal.c
#	src/battle_controllers.c
#	src/battle_dome.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/pokemon.c
 2022-07-15 12:58:46 -04:00
sphericalice
186f2c0232 Introduce a MOVE_UNAVAILABLE constant 2022-07-11 15:18:13 +01:00
ghoulslash
e4bf99d777 merge w be 2022-07-03 16:20:05 -04:00
sneed
5e7df653bd no gest 2022-06-18 19:18:01 +03:00
sneed
f43d54af89 AI chooses most resistant mon 2022-06-18 19:00:33 +03:00
Kurausukun
d3c8346a67 fix type, add bugfix 2022-06-17 21:58:56 -04:00
Kurausukun
23e9455e0a document design oddity, use constants, correct comment 2022-06-17 21:52:58 -04:00
ghoulslash
b33a8b0cb4 move ai score calc to STATE_TURN_START_RECORD so AI can consider move selection for item use 2022-06-05 11:09:04 -04:00
LOuroboros
fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine 2021-12-23 15:29:10 -08:00
ultima-soul
b0b8b9bf46 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-17 23:51:29 -08:00
ultima-soul
26f29a04fd Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync" 
This reverts commit ac2bcece75, reversing
changes made to 349262ebc3.
 2021-12-10 09:41:54 -08:00
ultima-soul
ac2bcece75 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync 2021-12-09 14:16:05 -08:00