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
|
be7d0bd3b0
|
Merge branch 'master' into doc-menu
|
2021-11-04 12:11:31 -04:00 |
|
GriffinR
|
c291fa8e7f
|
Propagate BG_COORD constants
|
2021-11-03 23:02:06 -04:00 |
|
GriffinR
|
50d3003a0d
|
Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW
|
2021-11-03 19:54:20 -04:00 |
|
GriffinR
|
9a0618afc3
|
Add COPYWIN constants
|
2021-11-03 15:29:18 -04:00 |
|
GriffinR
|
3e49ac804b
|
Merge branch 'master' into doc-finalmisc
|
2021-11-03 13:56:22 -04:00 |
|
GriffinR
|
afb9ff3a40
|
Document files with a few remaining symbols
|
2021-11-02 18:06:06 -04:00 |
|
GriffinR
|
fdaf436960
|
Add font id constants
|
2021-10-30 19:54:15 -04:00 |
|
GriffinR
|
ece7ef3410
|
Correct usage of MysteryEvent to MysteryGift
|
2021-10-17 03:00:48 -04:00 |
|