Eduardo Quezada ddc752eb14 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # asm/macros/event.inc # data/field_effect_scripts.s # data/maps/BattleFrontier_BattleTowerLobby/scripts.inc # data/script_cmd_table.inc # graphics/pokemon/castform/sunny/anim_front.png # graphics/pokemon/castform/sunny/normal.pal # include/battle_util.h # include/constants/event_object_movement.h # include/constants/field_effects.h # src/battle_controller_player.c # src/battle_util.c # src/data/object_events/movement_action_func_tables.h # src/data/object_events/object_event_pic_tables.h # src/data/trainer_graphics/back_pic_anims.h # src/daycare.c # src/event_object_movement.c # src/field_effect_helpers.c # src/load_save.c # src/scrcmd.c # src/trainer_see.c		2024-01-17 18:11:35 -03:00
..
abnormal_weather.inc
apprentice.inc
battle_pike.inc	Cleanup pt1	2023-06-17 23:34:01 -04:00
berry_blender.inc
berry_tree.inc	Fix string with duplicate berry berry	2023-12-24 22:59:43 +01:00
cable_club.inc	Add temp var aliases	2023-08-04 14:17:28 -04:00
cave_hole.inc
cave_of_origin.inc
check_furniture.inc
contest_hall.inc
day_care.inc	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3	2023-06-16 21:25:16 -04:00
debug.inc	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion	2023-12-07 12:18:50 +01:00
elite_four.inc
field_move_scripts.inc	Cleanup	2023-06-18 01:19:46 -04:00
field_poison.inc
flash.inc	Cleanup pt1	2023-06-17 23:34:01 -04:00
follower.inc	Cleanup	2023-06-18 01:19:46 -04:00
gabby_and_ty.inc	Add temp flag aliases	2023-08-03 15:55:06 -04:00
gift_altering_cave.inc	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
gift_aurora_ticket.inc
gift_battle_card.inc
gift_mystic_ticket.inc
gift_old_sea_map.inc
gift_pichu.inc	Updated term to modernFatefulEncounter	2023-02-11 22:36:42 -03:00
gift_stamp_card.inc
gift_trainer.inc
hall_of_fame.inc
interview.inc
item_ball_scripts.inc	Item Ball refactor / Pluralize item names for giveitem and finditem (#3942)	2024-01-14 21:35:45 +01:00
kecleon.inc
lilycove_lady.inc
mauville_man.inc	Document the trendy saying word group	2023-03-13 15:58:40 -04:00
move_tutors.inc	Removed tutor move distinction, combined llists	2022-08-25 19:56:47 -04:00
movement.inc
new_game.inc	Cleaned trailing whitespace	2022-09-11 14:14:49 -04:00
obtain_item.inc	Item Ball refactor / Pluralize item names for giveitem and finditem (#3942)	2024-01-14 21:35:45 +01:00
pc.inc	Implement Pokemon Box Link functionality (#3837)	2023-12-28 11:47:00 +01:00
pc_transfer.inc	Add temp var aliases	2023-08-04 14:17:28 -04:00
pkmn_center_nurse.inc	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3	2023-06-16 21:25:16 -04:00
players_house.inc
prof_birch.inc
profile_man.inc
questionnaire.inc
record_mix.inc
repel.inc	Improved Repel / Lure Menu (#3594)	2023-11-23 21:31:33 +01:00
rival_graphics.inc
roulette.inc	Cleaned trailing whitespace	2022-09-11 14:14:49 -04:00
safari_zone.inc
secret_base.inc	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3	2023-06-16 21:25:16 -04:00
secret_power_tm.inc	Reference TMs and HMs by move instead of number (#1732)	2023-08-09 10:51:01 -04:00
set_gym_trainers.inc
shared_secret_base.inc
std_msgbox.inc
surf.inc
test_signpost.inc
trainer_battle.inc	Cleanup	2023-06-18 01:19:46 -04:00
trainer_hill.inc	Incorporated upstream fixes	2023-10-27 11:04:10 -03:00
trainer_script.inc
tv.inc