Eduardo Quezada ead108d28e Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # src/data/graphics/pokemon.h		2024-02-19 13:49:10 -03:00
..
abilities.h
apprentice.h
battle_ai.h	Adds Powerful status move flag (#4125)	2024-02-18 15:05:08 +01:00
battle_anim_scripts.h
battle_anim.h	Generic Starting Battle Status Variable (#4176)	2024-02-14 10:05:37 +01: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	Merge branch '_RHH/master' into _RHH/upcoming	2024-02-19 10:13:13 -03:00
battle_palace.h
battle_partner.h
battle_pike.h
battle_pyramid.h
battle_script_commands.h	Secondary effects overhaul minor follow-up (#4062)	2024-02-04 23:02:59 +01:00
battle_setup.h
battle_string_ids.h	Adds Tidy Up + minor Dragon Cheer follow up (#4136)	2024-02-18 20:00:36 +01: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	Adds Powerful status move flag (#4125)	2024-02-18 15:05:08 +01:00
berry.h
cable_club.h
coins.h
contest.h
cries.h	Merge branch '_RHH/master' into _RHH/upcoming	2024-02-19 10:13:13 -03:00
daycare.h	Converts a bunch of #if to regular conditions (#4071)	2024-01-26 18:15:45 +01:00
decorations.h
easy_chat.h
event_bg.h
event_object_movement.h	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers	2024-02-17 23:40:08 -03:00
event_objects.h	Moved follower settings to overworld config	2024-02-18 00:16:59 -03:00
expansion.h	Non-tagged	2024-02-18 22:09:08 -03:00
field_effects.h	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers	2024-02-17 23:40:08 -03:00
field_poison.h
field_specials.h
field_tasks.h
field_weather.h
flags.h	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-01-17 18:11:35 -03:00
form_change_types.h
frontier_util.h
game_stat.h
global.h	Converts a bunch of #if to regular conditions (#4071)	2024-01-26 18:15:45 +01:00
heal_locations.h
hold_effects.h
item_effects.h
item.h	Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo (#4068)	2024-01-26 15:25:52 -03:00
items.h	Converts a bunch of #if to regular conditions (#4071)	2024-01-26 18:15:45 +01:00
layouts.h
lilycove_lady.h
map_groups.h
map_scripts.h
map_types.h
maps.h
mauville_old_man.h
metatile_behaviors.h
metatile_labels.h	Remove non-existent tilesets from label comments and alphabetize	2024-01-18 14:31:04 -05:00
moves.h
mystery_gift.h
opponents.h
party_menu.h
pokedex.h	Add configs for measurement systems and decimal separators (#4183)	2024-02-14 10:17:23 +01:00
pokemon_debug.h	Centered follower sprite better in debug menu	2024-01-19 14:24:50 -03:00
pokemon.h	Renamed NUM_ABILITY_VANILLA to NUM_ABILITY_PERSONALITY (#4196)	2024-02-15 15:22:25 +01:00
region_map_sections.h
rgb.h
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
sound.h
species.h	Add Indigo Disk Pokemon data (#3878)	2024-01-01 01:38:50 +01:00
tms_hms.h
trade.h
trainer_hill.h
trainer_types.h
trainers.h	Refactor mugshots (#4000)	2024-01-16 00:45:13 +01:00
tv.h
union_room.h
vars.h
weather.h
wild_encounter.h