mirror of
https://github.com/pret/pokeemerald.git
synced 2026-06-24 00:50:53 -05:00
70bad62f9b
# Conflicts: # Makefile # data/maps/BattleFrontier_BattleTowerLobby/scripts.inc # data/maps/OldaleTown/scripts.inc # data/maps/Route110_TrickHousePuzzle7/scripts.inc # data/maps/Route110_TrickHousePuzzle8/scripts.inc # data/scripts/roulette.inc # data/tilesets/graphics.inc # data/tilesets/metatiles.inc # graphics/trainer_card/0star_fr.pal # graphics/trainer_card/four_stars_fr.pal # graphics/trainer_card/frlg/0star.pal # graphics/trainer_card/frlg/blue.pal # graphics/trainer_card/frlg/bronze.pal # graphics/trainer_card/frlg/card.png # graphics/trainer_card/frlg/four_stars.pal # graphics/trainer_card/frlg/gold.pal # graphics/trainer_card/frlg/green.pal # graphics/trainer_card/frlg/one_star.pal # graphics/trainer_card/frlg/silver.pal # graphics/trainer_card/frlg/three_stars.pal # graphics/trainer_card/frlg/two_stars.pal # graphics/trainer_card/one_star_fr.pal # graphics/trainer_card/three_stars_fr.pal # graphics/trainer_card/two_stars_fr.pal # src/battle_message.c # src/battle_tent.c # src/berry_blender.c # src/berry_tag_screen.c # src/data/bard_music/length_table.h # src/data/credits.h # src/data/items.h # src/data/pokemon/pokedex_orders.h # src/data/region_map/region_map_entries.h # src/easy_chat.c # src/field_region_map.c # src/graphics.c # src/item.c # src/item_menu.c # src/menu_specialized.c # src/pokedex.c # src/pokedex_cry_screen.c # src/pokemon_jump.c # src/pokenav_conditions_search_results.c # src/pokenav_match_call_gfx.c # src/pokenav_ribbons_list.c # src/shop.c # src/trade.c # src/trainer_card.c # src/wireless_communication_status_screen.c |
||
|---|---|---|
| .. | ||
| abnormal_weather.inc | ||
| apprentice.inc | ||
| battle_pike.inc | ||
| berry_blender.inc | ||
| berry_tree.inc | ||
| cable_club.inc | ||
| cave_hole.inc | ||
| cave_of_origin.inc | ||
| check_furniture.inc | ||
| contest_hall.inc | ||
| day_care.inc | ||
| elite_four.inc | ||
| field_move_scripts.inc | ||
| field_poison.inc | ||
| flash.inc | ||
| gabby_and_ty.inc | ||
| gift_altering_cave.inc | ||
| gift_aurora_ticket.inc | ||
| gift_battle_card.inc | ||
| gift_mystic_ticket.inc | ||
| gift_old_sea_map.inc | ||
| gift_pichu.inc | ||
| gift_stamp_card.inc | ||
| gift_trainer.inc | ||
| hall_of_fame.inc | ||
| interview.inc | ||
| item_ball_scripts.inc | ||
| kecleon.inc | ||
| lilycove_lady.inc | ||
| mauville_man.inc | ||
| move_tutors.inc | ||
| movement.inc | ||
| new_game.inc | ||
| obtain_item.inc | ||
| pc_transfer.inc | ||
| pc.inc | ||
| pkmn_center_nurse.inc | ||
| players_house.inc | ||
| prof_birch.inc | ||
| profile_man.inc | ||
| questionnaire.inc | ||
| record_mix.inc | ||
| repel.inc | ||
| rival_graphics.inc | ||
| roulette.inc | ||
| safari_zone.inc | ||
| secret_base.inc | ||
| secret_power_tm.inc | ||
| set_gym_trainers.inc | ||
| shared_secret_base.inc | ||
| std_msgbox.inc | ||
| surf.inc | ||
| test_signpost.inc | ||
| trainer_battle.inc | ||
| trainer_hill.inc | ||
| trainer_script.inc | ||
| tv.inc | ||