Hedara 90aed43c27 Merge branch 'master' into master-upcoming ... Conflicts: .github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml .github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml .github/ISSUE_TEMPLATE/03_feature_requests.yaml .github/ISSUE_TEMPLATE/04_other_errors.yaml .github/pull_request_template.md src/battle_controller_player.c src/battle_main.c src/battle_script_commands.c src/battle_util.c src/data/graphics/pokemon.h src/data/pokemon/species_info/gen_9_families.h test/battle/ability/flower_veil.c test/battle/ability/sweet_veil.c test/battle/ability/synchronize.c test/battle/ability/water_bubble.c test/battle/move_effect/fell_stinger.c test/battle/move_effect/level_damage.c test/battle/move_effect/magic_room.c test/battle/move_effect/me_first.c test/battle/move_effect/sky_drop.c test/battle/move_effect/smack_down.c test/battle/move_effect/wish.c test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c		2025-05-22 15:41:08 +02:00
..
.gitignore	[Build System Rewrite] mapjson now takes output directory parameters. (#1949)	2024-08-29 14:01:01 -04:00
abilities.h	Embody Aspect fixes (#4439)	2024-04-27 19:35:42 +02:00
apprentice.h
battle_ai.h	Full functionality	2025-05-08 16:45:10 -04:00
battle_anim_scripts.h	Add many gen 8 move animations (#2861)	2023-06-21 13:19:54 -04:00
battle_anim.h	New animations for Mega Evolution, Primal Reversion, Ultra Burst, and Power Construct (#6834)	2025-05-15 09:40:02 +02:00
battle_arena.h
battle_dome.h	Battle Dome Automation (#3596)	2023-11-24 16:19:32 +01:00
battle_factory.h
battle_frontier_mons.h
battle_frontier_trainers.h
battle_frontier.h	Customizable FrontierMon Sets (#4313)	2024-03-29 08:47:17 +01:00
battle_move_effects.h	Remove non-volatile status EFFECTs (#6772)	2025-05-16 22:52:51 +02:00
battle_palace.h	Consolidate natures (#4562)	2024-05-19 10:14:31 +02:00
battle_partner.h	Adds B_VAR_DIFFICULTY and related functions READ DESC (#5337)	2025-01-04 14:25:03 +01:00
battle_pike.h
battle_pyramid.h
battle_script_commands.h	Further moveend changes (move blocks) (#6820)	2025-05-15 12:43:50 +02:00
battle_setup.h	Trainer Battle Parameter Consolidation (#5982)	2025-01-25 22:02:39 +01:00
battle_string_ids.h	New animations for Mega Evolution, Primal Reversion, Ultra Burst, and Power Construct (#6834)	2025-05-15 09:40:02 +02:00
battle_tent_mons.h
battle_tent_trainers.h
battle_tent.h
battle_tower.h
battle_z_move_effects.h	Removed some hardcoded move IDs (#3982)	2024-01-12 22:41:46 +01:00
battle.h	Merge branch 'master' into master-upcoming	2025-05-22 15:41:08 +02:00
berry.h	Refactor growth time and add six stage toggle	2023-12-07 13:22:01 +01:00
cable_club.h
characters.h	Added NBSP and up+down arrows to all fonts (#5767)	2024-12-07 07:26:23 -03:00
coins.h
contest.h	Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan	2025-01-17 21:57:25 +01:00
cries.h	Renamed folders and symbols to match species defines (#5581)	2024-10-27 20:15:11 +01:00
daycare.h	Converts a bunch of #if to regular conditions (#4071)	2024-01-26 18:15:45 +01:00
decorations.h
difficulty.h	Adds B_VAR_DIFFICULTY and related functions READ DESC (#5337)	2025-01-04 14:25:03 +01:00
easy_chat.h
event_bg.h
event_object_movement.h	Follower NPCs (follow-me) (#6500)	2025-04-27 14:56:18 +02:00
event_objects.h	Follower NPCs (follow-me) (#6500)	2025-04-27 14:56:18 +02:00
expansion.h	Merge branch 'master' into master-upcoming-2025-04-30	2025-04-30 15:22:37 +02:00
field_effects.h	Merge branch 'upcoming' into merrps-dns	2025-04-09 10:01:51 +02:00
field_poison.h
field_specials.h	spaces over tabs please don't eat my ass	2024-08-14 22:14:48 -07:00
field_tasks.h
field_weather.h	Review comments	2025-04-11 11:37:36 +02:00
flags.h	A lot of tests (#6734)	2025-05-07 16:50:12 +02:00
follower_npc.h	Rename follower npc macros for better specificity and to match documentation (#6742)	2025-05-02 21:08:42 +02:00
followers.h	Moved message counts to their own file + remove unneeded include	2024-05-21 22:04:22 -04:00
form_change_types.h	Make form change methods into enum + type checking (#6631)	2025-04-16 23:45:41 +02:00
frontier_util.h
game_stat.h	merge w pret master, add USE_DEXNAV_SEARCH_LEVELS flag	2024-06-16 09:45:38 -04:00
generational_changes.h	Merge branch 'master' into master-upcoming	2025-05-12 18:21:35 +02:00
global.h	Follower NPCs (follow-me) (#6500)	2025-04-27 14:56:18 +02:00
heal_locations.h	FRLG+ whiteout message (#4967)	2024-08-02 08:28:05 -07:00
hold_effects.h	Combined type-enhancing hold effects (#6846)	2025-05-14 13:45:08 +02:00
item_effects.h	Add Teal Mask item, move, and ability data (#3349)	2023-10-08 15:56:09 -03:00
item.h	Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo (#4068)	2024-01-26 15:25:52 -03:00
items.h	Decouple Poke Ball ids from item ids (#5560)	2024-10-28 18:03:15 +01:00
lilycove_lady.h
map_scripts.h
map_types.h	Revert "Converts a bunch of defines to enums" (#6082)	2025-01-22 21:50:39 +01:00
maps.h
mauville_old_man.h
metatile_behaviors.h	merge w upcoming	2024-09-29 13:33:20 -04:00
metatile_labels.h	Remove non-existent tilesets from label comments and alphabetize	2024-01-18 14:31:04 -05:00
moves.h	Competitive-formatted parties (#3545)	2024-04-06 15:05:15 -03:00
mystery_gift.h
opponents.h	Partner Battle refactor (#3592)	2023-12-20 12:38:28 +01:00
party_menu.h	Add "Move Item" option in party menu (#6758)	2025-05-04 11:40:31 +02:00
pokedex.h	Moved pokedex flags to constants files andadded constants to header of event_scripts	2024-08-14 19:24:55 -07:00
pokemon_icon.h	Add POKE_ICON_BASE_PAL_TAG to a header	2024-05-23 02:45:22 +03:00
pokemon_sprite_visualizer.h	Make Pokémon Sprite Visualizer name official (#4745)	2024-06-09 12:12:35 -04:00
pokemon.h	Evolution Refactor (#6556)	2025-04-23 16:01:33 +02:00
region_map_sections.h
regions.h	Fixed non-regional forms breeding incorrectly (#4985)	2025-02-03 17:03:29 +01:00
rematches.h	Fix trainer match call flags	2024-08-15 23:00:20 +02:00
rgb.h	A bit more of addressing	2025-01-17 19:25:29 -03:00
roulette.h
script_menu.h	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion	2024-01-05 00:32:21 +01:00
secret_bases.h
slot_machine.h
songs.h	Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan	2025-01-17 21:57:25 +01:00
sound.h
species.h	Rename Furfrou Species tags to match Pokemon Showdown exports (#6041)	2025-01-17 14:39:52 -03:00
tms_hms.h	Reference TMs and HMs by move instead of number (#1732)	2023-08-09 10:51:01 -04:00
trade.h	Revert "Converts a bunch of defines to enums" (#6082)	2025-01-22 21:50:39 +01:00
trainer_hill.h	Fix some frontier gfx, adjacent cleanup	2023-08-03 11:15:15 -04:00
trainer_slide.h	Removed Trainer Slides footgun (#6205)	2025-02-07 13:30:57 +01:00
trainer_types.h
trainers.h	Revert "Converts a bunch of defines to enums" (#6082)	2025-01-22 21:50:39 +01:00
tv.h	Clean up pokemon/ball/dex mentions in comments	2023-12-12 19:02:36 +01:00
union_room.h
vars.h	Refactor testing flags and vars to not conflict with user ones (#6301)	2025-02-22 15:32:39 +01:00
weather.h	Evolution Refactor (#6556)	2025-04-23 16:01:33 +02:00
wild_encounter.h	merge w upcoming	2024-10-04 12:56:21 -04:00