pokeemerald/src/data
Eduardo Quezada a6dbb68bac Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
#	data/battle_scripts_1.s
#	src/battle_util.c
#	src/battle_z_move.c
2023-08-17 13:42:09 -04:00
..
bard_music Revert "Removed Unown hack" 2023-01-07 11:39:56 -03:00
battle_frontier Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 2023-02-15 14:11:03 -03:00
decoration
easy_chat Matching merge from upstream pret 2023-01-20 12:31:54 -03:00
field_effects Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
graphics Gender differences sprites, final part (#3122) 2023-07-18 21:31:22 -04:00
object_events Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 2022-10-30 12:30:38 -03:00
pokemon [battle, movesets] revert bulbasaur's level up change 2023-08-02 09:51:45 +02:00
pokemon_graphics Gender differences sprites, final part (#3122) 2023-07-18 21:31:22 -04:00
region_map Update gitignore/spacing for new region map data 2022-10-30 12:22:41 -04:00
text Changed all instances of gSpeciesNames so that it uses GetSpeciesName 2023-07-07 14:37:51 -04:00
tilesets Give tileset palettes proper type, name compressed secret base tiles 2022-10-08 02:02:12 -04:00
trainer_graphics Add NUM_MON_PIC_FRAMES, and trainer pic size constants 2022-10-10 23:16:08 -04:00
.gitignore Update gitignore/spacing for new region map data 2022-10-30 12:22:41 -04:00
battle_anim.h [battle, anim] woodhammer animation overhaul (#3192) 2023-08-01 19:10:18 -04:00
battle_moves.h Remove soundMove from Steam Eruption and replace it with sheerForceBoost (#3229) 2023-08-13 00:53:22 -04:00
contest_moves.h Added Psyblade and Hydro Steam 2023-03-17 09:25:39 -03:00
contest_opponents.h Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 2023-02-15 14:11:03 -03:00
contest_text_tables.h
credits.h
heal_locations.h
item_icon_table.h Added icon for Clear Amulet (#3078) 2023-06-26 18:19:33 -04:00
items.h Corrected conditionals used for B_SPEED_BUFFING_RAPID_SPIN and I_GEM_BOOST_POWER (#3232) 2023-08-14 16:14:12 -04:00
lilycove_lady.h
map_group_count.h Automated creation of MAP_GROUP_COUNT for the debug menu 2022-09-09 23:34:05 -04:00
party_menu.h Add Frostbite status 2023-04-22 18:23:08 +02:00
pointillism_points.h
pokedex_area_glow.h
script_menu.h
trade.h Sync trade anim 2023-01-09 15:32:04 -05:00
trainer_parties.h fix trainer party 2023-02-22 20:44:03 +01:00
trainers.h Merge remote-tracking branch 'pret/master' into MergedBranchUltimate 2022-08-22 20:30:45 -04:00
union_room.h Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124 2022-11-24 15:36:00 -03:00
wallpapers.h
wild_encounters.json
wild_encounters.json.txt