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
|
b7d92e8537
|
Revert incorrect constant usage, add new correct ones
|
2023-01-18 12:11:09 -05: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 |
|
Eduardo Quezada
|
6c457f42af
|
Corrected uses of GetBattlerSide
|
2022-08-27 00:59:12 -04:00 |
|
Eduardo Quezada
|
7c86bd5d08
|
Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826
# Conflicts:
# include/battle_interface.h
# src/battle_anim_effects_1.c
# src/battle_script_commands.c
# src/field_specials.c
|
2022-08-26 22:23:37 -04:00 |
|
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 |
|
GriffinR
|
c2d5dd2a1f
|
Additional battle anim sync
|
2022-08-19 11:51:13 -04:00 |
|
Eduardo Quezada
|
01558ff8f3
|
Struct pointers star standarizing
|
2022-07-29 11:15:33 -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 |
|
ultima-soul
|
0312c5be8b
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-11-27 21:38:26 -08:00 |
|
GriffinR
|
d20341646a
|
Start battle_anim_mons doc
|
2021-11-08 11:46:13 -05:00 |
|
ultima-soul
|
02c9e040df
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-08-11 16:33:10 -07:00 |
|
PikalaxALT
|
810ca5f8ff
|
Flatten pos fields in struct Sprite
|
2021-07-07 09:11:52 -04:00 |
|
DizzyEggg
|
e2f14d43db
|
Fix Gravity's animation
|
2021-06-08 12:13:40 +02:00 |
|
ultima-soul
|
5bab9474dc
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-03-22 23:08:19 -07:00 |
|
GriffinR
|
b04f0aaa2b
|
Use SPRITE_NONE constant
|
2021-02-24 11:03:32 -05:00 |
|
DizzyEggg
|
90486324c6
|
Animation for Tupsy Toruvy
|
2020-04-16 16:52:25 +02:00 |
|
DizzyEggg
|
6968124529
|
Merge battle anim documentation
|
2020-02-29 13:59:41 +01:00 |
|
GriffinR
|
efd53d080c
|
Clean up battle anim C for doc
|
2020-02-25 12:54:08 -06:00 |
|
GriffinR
|
afa1ae2209
|
Finish documenting move anim scripts
|
2020-02-25 12:54:08 -06:00 |
|
GriffinR
|
e633b57593
|
Document remaining status/general/special anims
|
2020-02-25 12:54:08 -06:00 |
|
GriffinR
|
1ba12dc050
|
Document move anims I-S
|
2020-02-25 12:54:08 -06:00 |
|
GriffinR
|
501d0d3c18
|
Document move anims C-H
|
2020-02-25 12:54:08 -06:00 |
|
GriffinR
|
6eb44dc507
|
Document move anims A-C
|
2020-02-25 12:54:08 -06:00 |
|
DizzyEggg
|
83936185be
|
Add precautions
|
2019-04-01 15:08:19 +02:00 |
|
Marcus Huderle
|
462b196abc
|
Give battle_anim files appropriate names
|
2019-03-31 12:15:39 -05:00 |
|