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
|
866d916f2f
|
SpriteTemplate formatting
|
2022-08-27 02:07:58 -04:00 |
|
Eduardo Quezada
|
f3bebcd12c
|
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
# Conflicts:
# include/battle_anim.h
# include/global.h
# include/pokemon.h
# src/battle_message.c
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
|
2022-07-22 22:57:02 -04:00 |
|
sphericalice
|
284e46927a
|
Use the FREE_AND_SET_NULL macro where appropriate
|
2022-06-03 15:56:11 +01:00 |
|
ultima-soul
|
4f2e3bf214
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-12-17 21:23:54 -08:00 |
|
GriffinR
|
c291fa8e7f
|
Propagate BG_COORD constants
|
2021-11-03 23:02:06 -04:00 |
|
GriffinR
|
9a0618afc3
|
Add COPYWIN constants
|
2021-11-03 15:29:18 -04:00 |
|
GriffinR
|
fdaf436960
|
Add font id constants
|
2021-10-30 19:54:15 -04:00 |
|
GriffinR
|
6067aa65b4
|
Fix shadw typo
|
2021-10-21 22:15:08 -04:00 |
|
GriffinR
|
ff594ccb82
|
Fix leftover icon_shadow names
|
2021-10-17 03:22:55 -04:00 |
|
GriffinR
|
ece7ef3410
|
Correct usage of MysteryEvent to MysteryGift
|
2021-10-17 03:00:48 -04:00 |
|