Eduardo Quezada 3172273c73 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures ...

# Conflicts:
#	src/pokemon.c

2022-10-30 12:16:09 -03:00

..

layouts

…

maps

Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909

2022-09-16 11:56:50 -03:00

scripts

Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures

2022-10-30 12:16:09 -03:00

text

Fixed instances of .string being used with spaces instead of tabs

2022-08-15 14:32:01 -04:00

tilesets

…

battle_anim_scripts.s

fix whitespace

2022-10-16 23:39:12 -04:00

battle_scripts_1.s

Merge branch 'dev' into teleport

2022-09-24 14:39:21 -03:00

battle_scripts_2.s

…

contest_ai_scripts.s

Incorporate commented bug fixes in contest AI scripts

2022-08-19 19:45:15 -04:00

event_scripts.s

Item config for repel prompt

2022-09-12 10:21:52 -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

Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms

2022-08-22 17:27:21 -04:00

specials.inc

Fixed battle frontier tutors (for real this time)

2022-08-27 22:45:10 -04:00

tilesets.s

…