pokeemerald/src/data
Hedara 1abfa7acfa Merge branch 'master' into master-upcoming
Conflicts:
	include/battle.h
	include/constants/battle_string_ids.h
	src/battle_ai_util.c
	src/battle_main.c
	src/battle_util.c
	test/battle/ai/ai.c
2025-05-12 18:21:35 +02:00
..
bard_music Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan 2025-01-17 21:57:25 +01:00
battle_frontier Merge remote-tracking branch 'pret/master' into pret-merge-2025-03-29 2025-03-29 14:21:29 +01:00
decoration Remove compressed palettes (#6455) 2025-04-26 22:58:40 +02:00
easy_chat Merge remote-tracking branch 'pret/master' into pret-merge-2025-02-11 2025-02-11 11:20:37 +01:00
field_effects Review comments 2025-04-11 11:37:36 +02:00
graphics Merge branch 'master' into master-upcoming-2025-04-30 2025-04-30 15:22:37 +02:00
object_events Follower NPCs (follow-me) (#6500) 2025-04-27 14:56:18 +02:00
pokemon Merge branch 'master' into master-upcoming 2025-05-12 18:21:35 +02:00
region_map
text Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into pretmerge7aug 2024-08-07 12:42:45 +02:00
tilesets Removed legacy handling, fix if statment argument style 2025-04-11 21:27:49 +02:00
.gitignore Pokedex Plus HGSS move configs (#6687) 2025-04-24 19:34:37 +02:00
abilities.h Merge branch '_RHH/master' into _RHH/upcoming 2024-10-12 16:23:27 -03:00
battle_anim.h Remove compressed palettes (#6455) 2025-04-26 22:58:40 +02:00
battle_move_effects.h Centralizes non volatile status effect checks (#6533) 2025-04-30 11:34:19 -04:00
battle_partners.h Make generated files match the current formatting (#6636) 2025-04-17 13:38:30 +02:00
battle_partners.party Make trainerproc compatible with partners (#4421) 2024-04-22 17:03:36 +02:00
battle_pool_rules.h Trainer Party Pools (#5731) 2025-01-25 13:28:46 +01:00
contest_moves.h
contest_opponents.h Consolidated contest opponent filters into gContestOpponents (#6119) 2025-01-26 23:12:49 +01:00
contest_text_tables.h
credits.h
gimmicks.h Gimmick Indicator refactor (#6553) 2025-04-10 23:56:26 +02:00
heal_locations_pkm_center.h Remove trailing whitespace pass 10-2-2024 (Upcoming) (#5456) 2024-10-02 21:20:23 +02:00
heal_locations.h
item_icon_table.h Test runner set mode (#4661) 2024-05-30 21:24:33 +02:00
items.h Changed White Herb hold effect name (#6815) 2025-05-11 11:34:47 +02:00
lilycove_lady.h Consolidated Lilycove Contest Lady's values into one struct (#4951) 2024-07-13 14:44:22 +02:00
moves_info.h Centralizes non volatile status effect checks (#6533) 2025-04-30 11:34:19 -04:00
partner_parties.h Make trainerproc compatible with partners (#4421) 2024-04-22 17:03:36 +02:00
party_menu.h Add "Move Item" option in party menu (#6758) 2025-05-04 11:40:31 +02:00
pointillism_points.h
pokedex_area_glow.h
script_menu.h Converts multi-choice options to COMPOUND_STRINGs (#5686) 2024-12-03 12:32:13 +01:00
trade.h
trainer_parties.h Competitive-formatted parties (#3545) 2024-04-06 15:05:15 -03:00
trainers.h Merge branch '_RHH/master' into _RHH/upcoming 2025-02-12 09:30:59 -03:00
trainers.party Fixed a missing ) in trainers.party comment block. (#6367) 2025-03-02 15:00:57 +01:00
types_info.h Easy customizable Hidden Move types (#5872) 2025-01-04 21:42:14 +01:00
union_room.h Hide in-battle types from Union Room trade request (#6489) 2025-03-30 10:57:58 +02:00
wallpapers.h
wild_encounters.json Final cleanup 2024-05-16 18:08:10 -04:00
wild_encounters.json.txt Revert rtc based encounters (#5331) 2024-09-06 21:09:04 +02:00