Eduardo Quezada ce7fe75ac1 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/pret_20231210 ...

# Conflicts:
#	src/data/pokemon/species_info.h

2023-12-10 13:49:55 -03:00

..

layouts

…

maps

Incorporated upstream fixes

2023-10-27 11:04:10 -03:00

scripts

Fix issue where Sky Battles cause upcoming not to compile when debug menu is turned off (#3617)

2023-11-29 23:08:36 +01:00

text

Port pokefirered's Vs. Seeker to pokeemerald (#3256)

2023-11-26 18:58:43 +01:00

tilesets

…

battle_anim_scripts.s

EFFECT_CHILLY_RECEPTION (#3379)

2023-12-06 17:11:13 +01:00

battle_scripts_1.s

Merge branch 'RHH/upcoming' into RHH/pr/upcoming/pret_20231210

2023-12-10 13:49:55 -03:00

battle_scripts_2.s

Remove all trailing whitespace (upcoming) (#3473)

2023-10-27 13:54:55 -03:00

contest_ai_scripts.s

Incorporated upstream fixes

2023-10-27 11:04:10 -03:00

event_scripts.s

Port pokefirered's Vs. Seeker to pokeemerald (#3256)

2023-11-26 18:58:43 +01:00

field_effect_scripts.s

Port pokefirered's Vs. Seeker to pokeemerald (#3256)

2023-11-26 18:58:43 +01: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

…

sound_data.s

…

specials.inc

fix new line (#3621)

2023-11-30 20:01:21 -03:00