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 |
|
Martin Griffin
|
912a80e27a
|
Reference TMs and HMs by move instead of number (#1732)
|
2023-08-09 10:51:01 -04:00 |
|
ultima-soul
|
988320b89a
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-08-17 11:25:13 -07:00 |
|
GriffinR
|
06351bf63c
|
Remove address comments
|
2021-07-20 15:18:31 -04:00 |
|
SphericalIce
|
0a94dba4a7
|
Rename item script labels to fit the established name scheme
|
2021-06-13 13:21:23 +01:00 |
|
ExpoSeed
|
c3113b43bb
|
Merge branch 'item_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-item-expansion
|
2020-10-04 02:36:07 -05:00 |
|
Eduardo Quezada
|
46ccb91155
|
Fixed "Ultra Rope" name.
|
2020-09-13 11:35:05 -03:00 |
|
DizzyEggg
|
044f070020
|
Merge with master
|
2020-01-18 15:04:56 +01:00 |
|
GriffinR
|
f2e7b1507e
|
Port some macro/script fixes from pokefirered
|
2020-01-11 14:12:31 -05:00 |
|
DizzyEggg
|
9a2888fdbf
|
Merge into master
|
2019-12-23 16:46:03 +01:00 |
|
GriffinR
|
6967caefb2
|
Split finditem_std from giveitem_std
|
2019-12-14 08:41:46 -06:00 |
|
DizzyEggg
|
896602db5b
|
Begin item expansion
|
2019-04-13 13:14:45 +02:00 |
|
Fontbane
|
90e32f4ec5
|
Document landmark setting and item balls
|
2019-04-04 19:34:35 -05:00 |
|
Diegoisawesome
|
f497c1508b
|
Split files from event_scripts.s
Also move maps/scripts to scripts/maps
|
2017-11-11 16:10:17 -06:00 |
|