Eduardo Quezada b62e5aa72e Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 ...

# Conflicts:
#	src/battle_main.c
#	src/field_specials.c
#	src/trade.c

2023-02-15 14:11:03 -03:00

..

layouts

…

maps

Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214

2023-02-15 14:11:03 -03:00

scripts

Fixed reusable repels/lures function forcefully using items while menu config is on

2023-01-04 00:00:13 -03:00

text

…

tilesets

Convert tilesets.s to C

2022-09-27 17:23:26 -04:00

battle_anim_scripts.s

Merge pull request #2669 from Jaizu/giga_impact_contests

2023-02-13 09:22:24 +01:00

battle_scripts_1.s

Fix Round's Base Power calc, Add Turn order effects (#2602)

2023-02-14 16:49:50 +01:00

battle_scripts_2.s

Organized conffig files into their own folder and cleaned up

2022-11-14 11:03:49 -03: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

…

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/sync/pret_20230214

2023-02-15 14:11:03 -03:00