Eduardo Quezada 820113d883 Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # data/battle_anim_scripts.s # data/battle_scripts_1.s # include/battle_scripts.h # include/battle_util.h # src/battle_script_commands.c # src/battle_util.c		2023-09-07 15:13:06 -03:00
..
layouts
maps	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
scripts	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
text
tilesets	Convert tilesets.s to C	2022-09-27 17:23:26 -04:00
battle_anim_scripts.s	Merge branch 'RHH/master' into RHH/upcoming	2023-09-07 15:13:06 -03:00
battle_scripts_1.s	Merge branch 'RHH/master' into RHH/upcoming	2023-09-07 15:13:06 -03:00
battle_scripts_2.s	remove gActiveBattler entirely	2023-08-30 12:46:22 +02:00
contest_ai_scripts.s
event_scripts.s	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03:00
field_effect_scripts.s
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	Review changes	2023-02-15 13:56:11 -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	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413	2023-04-13 17:05:48 -04:00