Eduardo Quezada 51b716c9d9 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319 ... # Conflicts: # data/battle_scripts_2.s # include/constants/battle_string_ids.h # include/constants/songs.h # src/battle_message.c # src/data/pokemon/species_info.h		2023-03-19 20:28:56 -03:00
..
layouts
maps	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319	2023-03-19 20:28:56 -03:00
scripts	Updated the debug menu	2023-03-08 15:27:22 -03:00
text
tilesets
battle_anim_scripts.s	Added Psyblade and Hydro Steam	2023-03-17 09:25:39 -03:00
battle_scripts_1.s	Added Psyblade and Hydro Steam	2023-03-17 09:25:39 -03:00
battle_scripts_2.s	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319	2023-03-19 20:28:56 -03:00
contest_ai_scripts.s
event_scripts.s
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
specials.inc	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303	2023-03-03 11:00:50 -03:00