Eduardo Quezada
|
0d5b00aaf2
|
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# data/maps/BattleFrontier_Lounge7/scripts.inc
# include/battle_anim.h
# include/battle_message.h
# include/constants/items.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_anim_throw.c
# src/battle_anim_utility_funcs.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_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/party_menu.h
# src/data/pokemon/tmhm_learnsets.h
# src/daycare.c
# src/field_specials.c
# src/hall_of_fame.c
# src/party_menu.c
# src/pokemon.c
# src/tv.c
|
2023-08-31 14:28:01 -04:00 |
|
GriffinR
|
18319e8da3
|
Misc missing constant use
|
2023-08-10 01:42:18 -04:00 |
|
Eduardo Quezada D'Ottone
|
8332bfae46
|
Gen 8 combo moves
|
2021-11-01 21:59:34 -03:00 |
|
ultima-soul
|
02c9e040df
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-08-11 16:33:10 -07:00 |
|
GriffinR
|
810b51f96c
|
Clarify contest heart tiles
|
2021-06-21 13:48:03 -04:00 |
|
ultima-soul
|
56fc420187
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-04-28 21:34:30 -07:00 |
|
GriffinR
|
bc9fc38254
|
Misc contest cleanup
|
2021-04-22 15:51:04 -04:00 |
|
GriffinR
|
dbe24f0baa
|
Clean up contest_painting
|
2021-04-21 20:04:12 -04:00 |
|
DizzyEggg
|
f70a9ce153
|
Merge with master
|
2020-08-27 12:01:28 +02:00 |
|
GriffinR
|
fbb70b3727
|
Document contest AI scripts
|
2020-08-21 14:57:17 -04:00 |
|
GriffinR
|
2749948eeb
|
Clean up contest doc
|
2020-08-16 05:52:17 -04:00 |
|
GriffinR
|
aca50c87be
|
Continue new contest documentation
|
2020-07-24 00:14:53 -04:00 |
|
GriffinR
|
52a4428ba6
|
Begin new contest documentation
|
2020-07-23 17:55:40 -04:00 |
|
GriffinR
|
24569583e4
|
Document contest results
|
2020-06-18 17:50:13 -04:00 |
|
GriffinR
|
ef8370566f
|
Document Contest scripts
|
2019-11-13 18:20:55 -06:00 |
|
GriffinR
|
6db014cc32
|
Document party_menu first pass
|
2019-10-25 15:41:06 -04:00 |
|
GriffinR
|
f08615881e
|
Changes from review
|
2019-08-21 17:06:55 -05:00 |
|