sovereignx/include/constants
Eduardo Quezada 92301398bc Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
# Conflicts:
#	asm/macros/battle_script.inc
#	data/battle_anim_scripts.s
#	data/battle_scripts_1.s
#	include/battle.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/config/battle.h
#	include/constants/battle.h
#	include/constants/battle_anim.h
#	include/constants/battle_move_effects.h
#	include/constants/battle_string_ids.h
#	include/data.h
#	include/random.h
#	sound/cry_tables.inc
#	src/battle_anim_new.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/pokemon/form_change_table_pointers.h
#	src/data/pokemon/species_info.h
#	src/data/text/move_names.h
#	test/test_runner_battle.c
2023-10-09 16:51:41 -03:00
..
abilities.h Add Teal Mask item, move, and ability data (#3349) 2023-10-08 15:56:09 -03:00
apprentice.h
battle.h Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax 2023-10-09 16:51:41 -03:00
battle_ai.h AI battle tests + AI logic fixes (#3361) 2023-10-04 18:53:29 +01:00
battle_anim.h Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax 2023-10-09 16:51:41 -03:00
battle_anim_scripts.h Add many gen 8 move animations (#2861) 2023-06-21 13:19:54 -04:00
battle_arena.h
battle_dome.h
battle_factory.h
battle_frontier.h
battle_frontier_mons.h
battle_frontier_trainers.h
battle_move_effects.h Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax 2023-10-09 16:51:41 -03:00
battle_palace.h
battle_pike.h
battle_pyramid.h Misc field_specials cleanup 2023-02-01 11:48:55 -05:00
battle_script_commands.h Merge branch 'RHH/master' into RHH/upcoming 2023-09-24 20:32:45 -03:00
battle_setup.h
battle_string_ids.h Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax 2023-10-09 16:51:41 -03:00
battle_tent.h
battle_tent_mons.h
battle_tent_trainers.h
battle_tower.h
berry.h
cable_club.h
coins.h
contest.h Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829 2023-08-31 14:28:01 -04:00
daycare.h Remove unused INHERITED_IV_COUNT define 2023-01-31 09:44:47 +01:00
decorations.h
easy_chat.h Document the trendy saying word group 2023-03-13 15:58:40 -04:00
event_bg.h
event_object_movement.h
event_objects.h Sync clone object macro 2023-02-08 13:11:10 -05:00
field_effects.h
field_poison.h
field_specials.h Misc field_specials cleanup 2023-02-01 11:48:55 -05:00
field_tasks.h
field_weather.h
flags.h Merge pull request #1904 from GriffinRichards/temp-alias 2023-08-11 15:45:00 -04:00
form_change_types.h Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax 2023-10-09 16:51:41 -03:00
frontier_util.h
game_stat.h Rename GAME_STAT_FISHING_CAPTURES to GAME_STAT_FISHING_ENCOUNTERS 2023-06-05 14:15:07 +02:00
global.h Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829 2023-08-31 14:28:01 -04:00
heal_locations.h
hold_effects.h Add Berserk Gene Item (#2893) 2023-04-25 15:03:57 -04:00
item.h
item_effects.h Add Teal Mask item, move, and ability data (#3349) 2023-10-08 15:56:09 -03:00
items.h Add Teal Mask item, move, and ability data (#3349) 2023-10-08 15:56:09 -03:00
layouts.h
lilycove_lady.h
map_groups.h
map_scripts.h
map_types.h
maps.h Correct comment in maps.h 2023-01-18 11:54:06 -05:00
mauville_old_man.h
metatile_behaviors.h Clarify MB_SEMI_DEEP_WATER name 2023-01-17 21:32:55 -05:00
metatile_labels.h Sort metatile labels alphabetically 2023-02-14 14:36:27 -05:00
moves.h Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax 2023-10-09 16:51:41 -03:00
mystery_gift.h
opponents.h
party_menu.h Add Frostbite status 2023-04-22 18:23:08 +02:00
pokedex.h
pokemon.h Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax 2023-10-09 16:51:41 -03:00
pokemon_debug.h
region_map_sections.h
rgb.h add silk trap anim 2023-01-28 09:03:18 -05:00
roulette.h
script_menu.h
secret_bases.h
slot_machine.h
songs.h Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319 2023-03-19 20:28:56 -03:00
sound.h
species.h Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-03-21 09:56:58 -07:00
tms_hms.h Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
trade.h Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 2023-02-15 14:11:03 -03:00
trainer_hill.h Fix some frontier gfx, adjacent cleanup 2023-08-03 11:15:15 -04:00
trainer_types.h
trainers.h Removed uses of F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED 2023-07-05 18:22:48 -04:00
tv.h Redefine TV_SHOWS_COUNT 2023-04-27 13:59:09 -04:00
union_room.h
vars.h Add temp var aliases 2023-08-04 14:17:28 -04:00
weather.h
wild_encounter.h
z_move_effects.h