Eduardo Quezada
|
afcc1178b2
|
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.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_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
|
2022-08-22 20:30:45 -04:00 |
|
Eduardo Quezada D'Ottone
|
e4ae280ca6
|
Fixed calls to IsZMove
|
2022-07-21 15:32:14 -04:00 |
|
ExpoSeed
|
5fd468f507
|
Review comments. Commented code removed, ShouldAIUseZMove moved to battle_ai_util and renamed to be consistent with other fns
|
2022-03-22 13:10:24 -05:00 |
|
Evan
|
ce19e33cc4
|
handle double and multi battles
|
2020-12-01 13:43:15 -05:00 |
|
Evan
|
fd8951d040
|
trainer z move ai
|
2020-12-01 08:24:33 -05:00 |
|
Evan
|
a0bde70493
|
z move effects
|
2020-11-30 10:55:46 -05:00 |
|
Evan
|
f114534ae3
|
z move anim/effect, black hole eclipse anim
|
2020-11-28 13:09:43 -05:00 |
|
Evan
|
348d70b309
|
z move indicator and some data
|
2020-11-26 15:56:18 -05:00 |
|