Eduardo Quezada 92301398bc Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax ... # Conflicts: # asm/macros/battle_script.inc # data/battle_anim_scripts.s # data/battle_scripts_1.s # include/battle.h # include/battle_controllers.h # include/battle_interface.h # include/config/battle.h # include/constants/battle.h # include/constants/battle_anim.h # include/constants/battle_move_effects.h # include/constants/battle_string_ids.h # include/data.h # include/random.h # sound/cry_tables.inc # src/battle_anim_new.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controller_player_partner.c # src/battle_interface.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/data/pokemon/form_change_table_pointers.h # src/data/pokemon/species_info.h # src/data/text/move_names.h # test/test_runner_battle.c		2023-10-09 16:51:41 -03:00
..
layouts	Label unused layouts	2021-02-08 14:45:56 -05:00
maps	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
scripts	Fix give daycare egg option giving buggy eggs (#3335)	2023-09-22 12:20:00 -03:00
text	Fixed instances of .string being used with spaces instead of tabs	2022-08-15 14:32:01 -04:00
tilesets	Convert tilesets.s to C	2022-09-27 17:23:26 -04:00
battle_anim_scripts.s	Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax	2023-10-09 16:51:41 -03:00
battle_scripts_1.s	Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax	2023-10-09 16:51:41 -03:00
battle_scripts_2.s	Wild battle tests + tests for exp points (#3342)	2023-09-27 08:35:05 +01:00
contest_ai_scripts.s	Incorporate commented bug fixes in contest AI scripts	2022-08-19 19:45:15 -04:00
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	Continue battle_transition documenting	2021-10-29 11:24:36 -04:00
map_events.s	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
maps.s	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
mb_berry_fix.gba	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
mb_colosseum.gba	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
mb_ereader.gba	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
multiboot_berry_glitch_fix.s	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
multiboot_ereader.s	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
multiboot_pokemon_colosseum.s	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
mystery_event_script_cmd_table.s	Remove address comments	2021-07-20 15:18:31 -04:00
mystery_gift.s	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
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