DizzyEggg
1a64938c9b
optimize dmg move result and ai who is faster
2023-09-13 13:23:19 +02:00
DizzyEggg
7c2ad314d4
merge with upcoming
2023-09-04 09:40:48 +02:00
Eduardo Quezada D'Ottone
c4e88760f5
Pret merge (2023/08/31) ( #3268 )
2023-08-31 14:52:18 -04:00
Eduardo Quezada
0d5b00aaf2
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
...
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# data/maps/BattleFrontier_Lounge7/scripts.inc
# include/battle_anim.h
# include/battle_message.h
# include/constants/items.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_anim_throw.c
# src/battle_anim_utility_funcs.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/party_menu.h
# src/data/pokemon/tmhm_learnsets.h
# src/daycare.c
# src/field_specials.c
# src/hall_of_fame.c
# src/party_menu.c
# src/pokemon.c
# src/tv.c
2023-08-31 14:28:01 -04:00
DizzyEggg
aae4a0970c
merge with upcoming
2023-08-30 15:46:27 +02:00
DizzyEggg
493c330cbd
merge with upcoming
2023-08-30 13:23:55 +02:00
DizzyEggg
a7615f9649
remove almost all usage of active battler
2023-08-30 11:21:10 +02:00
DizzyEggg
156aa59f18
start removing gActiveBattler in controller emitters
2023-08-29 15:21:31 +02:00
DizzyEggg
44acd287f1
solve conflicts
2023-08-29 10:41:05 +02:00
Pawkkie
906ea4a5b0
Add missing absorbing abilities to FindMonThatAbsorbsOpponentsMove ( #3218 )
...
* Add missing absorbing abilities to FindMonThatAbsorbsOpponentsMove
* Use array to match ability to absorbing type
Previous implementation involving piggybacking on a conditional in a bit of a messy fashion to check for each ability type, this should be more readable and more easily modified by a novice. This is almost exactly BuffelSaft's inclement emerald implementation.
* Minor syntax fixes
2023-08-28 13:39:27 +02:00
GriffinR
18319e8da3
Misc missing constant use
2023-08-10 01:42:18 -04:00
DizzyEggg
fec8f14fff
IsAiAiBattle function
2023-08-09 15:57:22 +02:00
DizzyEggg
f72ec368fc
improve switching with ai bad moves
2023-08-08 12:55:47 +02:00
DizzyEggg
c11839c648
Use isValidForBattle
2023-07-26 09:34:23 +02:00
DizzyEggg
f4dc5e931f
some more stuff
2023-07-18 12:01:25 +02:00
DizzyEggg
1bd4f9c7a8
rework incoming surviability
2023-07-18 11:36:09 +02:00
sbird
6482279fa3
[battle, math] refactor damage calculation to use proper fp type and inlined multiplication
2023-07-07 18:51:23 +02:00
Pawkkie
62ae3b1df1
Fix bug due to variable overflow when AI chooses new Pokemon to send out ( #3068 )
2023-06-21 12:59:30 -04:00
Alex
43821d606f
Fix Baton Pass for when Ace mon is the last alive ( #3067 )
...
* Updated preproc config for Diamond Storm
* Fix baton pass bug with IsAceMon
remove not needed check
---------
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2023-06-21 11:11:06 -04:00
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
Ct11217
cc4a9b9f4b
Recommit to Dev branch
2022-09-15 22:57:29 -06: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
