pokeemerald/include/constants
Hedara 9d80ad530d Merge branch 'master' into master-to-upcoming
Conflicts:
	Makefile
	data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
	data/maps/MtChimney/scripts.inc
	data/maps/MtPyre_Summit/scripts.inc
	data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
	include/constants/event_objects.h
	include/constants/expansion.h
	src/battle_script_commands.c
	src/battle_util.c
	src/field_screen_effect.c
2025-05-28 14:26:15 +02:00
..
.gitignore Generate heal location constants automatically, move data back to a single file. 2025-02-03 20:25:11 -05:00
abilities.h
apprentice.h
battle_ai.h Full functionality 2025-05-08 16:45:10 -04:00
battle_anim_scripts.h
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_factory.h
battle_frontier_mons.h
battle_frontier_trainers.h
battle_frontier.h
battle_move_effects.h Remove non-volatile status EFFECTs (#6772) 2025-05-16 22:52:51 +02:00
battle_palace.h
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
battle.h Merge branch 'master' into master-upcoming 2025-05-22 15:41:08 +02:00
berry.h
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
daycare.h
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 Merge branch 'master' into master-to-upcoming 2025-05-28 14:26:15 +02:00
expansion.h Merge branch 'master' into master-to-upcoming 2025-05-28 14:26:15 +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
field_tasks.h
field_weather.h Review comments 2025-04-11 11:37:36 +02:00
flags.h Merge commit '678fdf9' into pret-merge 2025-05-27 19:22:40 +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
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
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 Merge commit '07c897a' into pret-merge 2025-05-27 19:46:13 +02:00
hold_effects.h Combined type-enhancing hold effects (#6846) 2025-05-14 13:45:08 +02:00
item_effects.h
item.h
items.h
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 commit '113226b03ad745183299dae1833f2a773b927cef' into pret-merge 2025-05-27 18:34:53 +02:00
metatile_labels.h
moves.h
mystery_gift.h
opponents.h
party_menu.h Add "Move Item" option in party menu (#6758) 2025-05-04 11:40:31 +02:00
pokedex.h
pokemon_icon.h
pokemon_sprite_visualizer.h
pokemon.h Evolution Refactor (#6556) 2025-04-23 16:01:33 +02:00
regions.h Fixed non-regional forms breeding incorrectly (#4985) 2025-02-03 17:03:29 +01:00
rematches.h
rgb.h A bit more of addressing 2025-01-17 19:25:29 -03:00
roulette.h
script_menu.h
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
trade.h Revert "Converts a bunch of defines to enums" (#6082) 2025-01-22 21:50:39 +01:00
trainer_hill.h
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
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