DizzyEggg f2e8482488 Fix how switch-in effects are played out after multiple faints in the same turn (#4864) ... * Multiple switch-ins after fainting * empty new lines * Fix failing tests		2024-06-24 20:37:47 +02:00
..
layouts
maps	Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge18jun	2024-06-18 11:04:40 +02:00
scripts	Merge remote-tracking branch '_pret_origin/master' into _RHH/pr/master/pret_20240526	2024-05-26 18:34:26 -04:00
text	Revert "Guillotine: Decapitalize everything (#3949)" (#4525)	2024-05-13 19:19:37 +02:00
tilesets	Convert tilesets.s to C	2022-09-27 17:23:26 -04:00
battle_anim_scripts.s	Fix Smack Down anim + move anim tests (#4774)	2024-06-13 15:30:28 -04:00
battle_scripts_1.s	Fix how switch-in effects are played out after multiple faints in the same turn (#4864)	2024-06-24 20:37:47 +02:00
battle_scripts_2.s	Fix dire hit being used on incorrect target (#4626)	2024-05-26 00:06:55 +02:00
contest_ai_scripts.s	Incorporated upstream fixes	2023-10-27 11:04:10 -03:00
event_scripts.s	[Rebase of #4286] Reordered Debug_EventScript_InflictStatus1 (#4372)	2024-04-14 17:31:39 -04:00
field_effect_scripts.s	Port pokefirered's Vs. Seeker to pokeemerald (#3256)	2023-11-26 18:58:43 +01:00
map_events.s
maps.s
mb_berry_fix.gba
mb_colosseum.gba
mb_ereader.gba
multiboot_berry_glitch_fix.s
multiboot_ereader.s
multiboot_pokemon_colosseum.s
mystery_event_script_cmd_table.s
mystery_gift.s
script_cmd_table.inc	Merge remote-tracking branch '_pret/master' into _RHH/pr/master/pret_sync20240324	2024-03-24 13:52:18 -03:00
sound_data.s	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03:00
specials.inc	Pre-1.8 tweaks (#4275)	2024-03-12 12:21:03 +01:00