Hedara
|
2945c83bbc
|
Merge commit '2044bea883d08ec9266d21ac0cd6a56c3e0d5962' into pret-merge
Conflicts:
include/battle.h
include/battle_ai_script_commands.h
include/battle_anim.h
include/battle_controllers.h
include/battle_gfx_sfx_util.h
include/battle_main.h
include/battle_script_commands.h
include/battle_util.h
include/pokemon.h
include/recorded_battle.h
src/battle_ai_script_commands.c
src/battle_anim.c
src/battle_anim_mons.c
src/battle_anim_sound_tasks.c
src/battle_anim_status_effects.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_controllers.c
src/battle_gfx_sfx_util.c
src/battle_interface.c
src/battle_main.c
src/battle_message.c
src/battle_records.c
src/battle_script_commands.c
src/battle_tv.c
src/battle_util.c
src/battle_util2.c
src/pokeball.c
src/pokemon.c
src/recorded_battle.c
src/reshow_battle_screen.c
|
2025-05-15 21:15:37 +02:00 |
|
Alex
|
2044bea883
|
Rename battlerId to battler for consistency (#2126)
|
2025-05-09 12:43:23 +01:00 |
|
Evan
|
7988a1f41d
|
Ai_TryOnAlly and reorganize files
|
2020-12-20 14:47:20 -07:00 |
|
Evan
|
916d0416e3
|
outline AI_CheckGoodMove
|
2020-12-15 21:57:33 -07:00 |
|
Evan
|
28698a982d
|
try to faint script -> c
|
2020-12-11 08:05:00 -07:00 |
|
ultima-soul
|
e32659d4bb
|
Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities.
|
2020-11-16 13:50:26 -08:00 |
|
DizzyEggg
|
ec4c73711e
|
Rest Sleep Talk wake up awaraness
|
2020-07-15 21:30:24 +02:00 |
|
ultima-soul
|
9ee5db6a96
|
Expand ability ids to u16. Thanks to ghoulslash for some assistance!
|
2020-05-18 14:54:12 -07:00 |
|
DizzyEggg
|
98b2e88e56
|
Forewarn
|
2020-04-28 15:36:13 +02:00 |
|
DizzyEggg
|
8ea7fcc348
|
better ai debug
|
2020-04-14 13:40:27 +02:00 |
|
DizzyEggg
|
cfb49cdd0b
|
Truant not dumb
|
2019-09-01 14:23:11 +02:00 |
|
DizzyEggg
|
272fa07799
|
AI switch mons if all moves are not usable
|
2019-06-11 10:45:12 +02:00 |
|
DizzyEggg
|
53b9d4a224
|
Dont clear AI flags on move choose. Will come in handy in smart ai switch logic
|
2018-12-22 20:57:12 +01:00 |
|
DizzyEggg
|
9c7db9f45e
|
New AI damage and type functions
|
2018-07-15 12:39:07 +02:00 |
|
DizzyEggg
|
caa36b530a
|
label and document battle windows
|
2018-06-17 16:48:58 +02:00 |
|
camthesaxman
|
c3dc14ba66
|
more renaming
|
2018-02-06 16:09:39 -06:00 |
|
DizzyEggg
|
6d4d58a8a7
|
rename battle4 and battleai
|
2017-09-28 17:38:07 +02:00 |
|