Eduardo Quezada 831b394ca1 Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909 ... # Conflicts: # Makefile # include/battle.h # include/battle_main.h # include/battle_util.h # include/data.h # make_tools.mk # map_data_rules.mk # src/battle_setup.c # src/fieldmap.c		2024-09-11 15:26:14 -03:00
..
layouts	refactor: code review for expansion	2024-05-17 20:45:32 -04:00
maps	Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909	2024-09-11 15:26:14 -03:00
scripts	Changed EVO_OVERWORLD_STEPS to use an EWRAM variable (#5047)	2024-07-27 20:48:59 +02:00
text	Revert "Guillotine: Decapitalize everything (#3949)" (#4525)	2024-05-13 19:19:37 +02:00
tilesets	Metatile + commas	2024-05-30 13:56:14 -04:00
battle_anim_scripts.s	some gen 9 move anims + fickle beam rework (#5159)	2024-08-14 17:20:18 +02:00
battle_scripts_1.s	Fixes Tar Shot on Tera mons (#5302)	2024-08-31 12:24:28 -04:00
battle_scripts_2.s	Remove trailing whitespace (master) (#5174)	2024-08-14 19:48:20 -07:00
contest_ai_scripts.s	Move general config file to the config folder (#4805)	2024-06-19 13:42:01 +02:00
event_scripts.s	Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909	2024-09-11 15:26:14 -03:00
field_effect_scripts.s	Whitespace, documentation and style	2024-01-22 19:12:52 -03: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	Remove unused callfunc	2024-06-02 10:53:45 -04:00
sound_data.s
specials.inc	Pre-1.8 tweaks (#4275)	2024-03-12 12:21:03 +01:00