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
|
a37d8b1346
|
Documented boolean uses
|
2022-07-25 14:59:14 -04:00 |
|
ultima-soul
|
0312c5be8b
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-11-27 21:38:26 -08:00 |
|
ultima-soul
|
3ed51d6d91
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-11-21 10:40:26 -08:00 |
|
GriffinR
|
e3b6337c3a
|
Finish battle_anim_mons doc
|
2021-11-08 14:29:37 -05:00 |
|
GriffinR
|
d20341646a
|
Start battle_anim_mons doc
|
2021-11-08 11:46:13 -05:00 |
|
GriffinR
|
31b501e7eb
|
Start misc battle documentation
|
2021-10-08 16:39:46 -04: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 |
|
ultima-soul
|
14a0303e2f
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-04-27 18:36:37 -07:00 |
|
GriffinR
|
62abcecc54
|
More usage of DISPLAY constants
|
2021-04-15 02:22:24 -04:00 |
|
GriffinR
|
98ab546d3a
|
Label misc unused move anims
|
2021-04-13 04:04:09 -04:00 |
|
GriffinR
|
2166e337a1
|
Label unused move anims
|
2021-04-11 13:21:22 -04:00 |
|
ultima-soul
|
5bab9474dc
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-03-22 23:08:19 -07:00 |
|
Marcus Huderle
|
a85fada314
|
Document more battle anim effects
|
2021-02-28 09:54:55 -06:00 |
|
Marcus Huderle
|
c323e7f061
|
Document some battle anim funcs and data
|
2021-02-27 11:04:45 -06:00 |
|
GriffinR
|
3fd5e143a9
|
Misc battle anim documentation
|
2021-01-23 00:40:46 -05:00 |
|
Evan
|
6c20a49dc6
|
animations for all moves
|
2020-05-25 00:37:32 -06:00 |
|
Evan
|
c18b5966bf
|
undo some revert(?)
|
2020-05-03 22:09:03 -06:00 |
|
DizzyEggg
|
6968124529
|
Merge battle anim documentation
|
2020-02-29 13:59:41 +01:00 |
|
GriffinR
|
51cd0ac081
|
Rename battle anim type files, remove unneeded ARG_RET_IDs
|
2020-02-25 12:54:08 -06:00 |
|