Bassoonian 6d38e260d6 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5nov		2024-11-05 10:31:40 +01:00
..
bard_music	Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5nov	2024-11-05 10:31:40 +01:00
battle_frontier
decoration	Clean up defines lacking spaces	2024-08-15 19:34:56 +02:00
easy_chat
field_effects	Replaced all usages of tabs in C files with spaces (#5261)	2024-08-26 16:55:54 -07:00
graphics	Removed old checksum matching workaround (#5480)	2024-10-08 14:02:31 +02:00
object_events	Fixed 64px uncompressed followers (#5601)	2024-10-27 11:24:40 -03:00
pokemon	Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015	2024-10-15 22:22:52 -03:00
pokemon_graphics
region_map
text	Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into pretmerge7aug	2024-08-07 12:42:45 +02:00
tilesets	Replaced all usages of tabs in C files with spaces (#5261)	2024-08-26 16:55:54 -07:00
.gitignore
abilities.h	Add text fitting tests for move, ability, item, and pokedex descriptions (#5505)	2024-10-12 19:37:11 +02:00
battle_anim.h	some gen 9 move anims + fickle beam rework (#5159)	2024-08-14 17:20:18 +02:00
battle_move_effects.h	some gen 9 move anims + fickle beam rework (#5159)	2024-08-14 17:20:18 +02:00
battle_partners.h
battle_partners.party
contest_moves.h
contest_opponents.h
contest_text_tables.h
credits.h
gimmicks.h	Remove trailing whitespace (master) (#5174)	2024-08-14 19:48:20 -07:00
heal_locations.h
item_icon_table.h
items.h	Add text fitting tests for move, ability, item, and pokedex descriptions (#5505)	2024-10-12 19:37:11 +02:00
lilycove_lady.h
moves_info.h	Fix weather genie move anims and springtide storm targets (#5553)	2024-10-22 16:27:10 +02:00
partner_parties.h
party_menu.h
pointillism_points.h
pokedex_area_glow.h
script_menu.h
trade.h
trainer_parties.h
trainers.h	trainerproc: Parse line markers (#5122)	2024-08-08 20:12:18 +02:00
trainers.party
types_info.h
union_room.h	Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909	2024-09-11 15:26:14 -03:00
wallpapers.h
wild_encounters.json
wild_encounters.json.txt