pokeemerald/data/scripts
Eduardo Quezada 124c17d315 Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
#	README.md
#	data/field_effect_scripts.s
#	data/maps/AncientTomb/scripts.inc
#	data/maps/DesertRuins/scripts.inc
#	data/maps/IslandCave/scripts.inc
#	data/scripts/follower.inc
#	graphics/object_events/pics/pokemon/wailord.png
#	graphics/object_events/pics/pokemon_old/substitute.png
#	include/constants/event_objects.h
#	include/global.h
#	remote_build.sh
#	spritesheet_rules.mk
#	src/bike.c
#	src/data/object_events/object_event_anims.h
#	src/data/object_events/object_event_graphics.h
#	src/data/object_events/object_event_graphics_info_followers.h
#	src/data/object_events/object_event_pic_tables.h
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/field_screen_effect.c
#	src/overworld.c
#	src/palette.c
#	src/pokemon_summary_screen.c
#	src/scrcmd.c
#	src/trainer_see.c
2024-02-17 23:40:08 -03:00
..
abnormal_weather.inc
apprentice.inc
battle_pike.inc Whitespace, documentation and style 2024-01-22 19:12:52 -03: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 Add extra key item bag space checks (#4066) 2024-01-26 21:11:04 +01:00
day_care.inc Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
debug.inc Save-compatible SaveBlock3 (#4112) 2024-02-10 18:14:36 +01:00
elite_four.inc
field_move_scripts.inc Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
field_poison.inc
flash.inc Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
follower.inc Merge branch 'merrp/pr/style' into followers 2024-02-15 22:49:36 -05: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 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
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_transfer.inc Add temp var aliases 2023-08-04 14:17:28 -04:00
pc.inc Implement Pokemon Box Link functionality (#3837) 2023-12-28 11:47:00 +01:00
pkmn_center_nurse.inc Whitespace, documentation and style 2024-01-22 19:12:52 -03: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 Whitespace, documentation and style 2024-01-22 19:12:52 -03: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 Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
trainer_hill.inc Incorporated upstream fixes 2023-10-27 11:04:10 -03:00
trainer_script.inc
tv.inc