Eduardo Quezada 021074cd2e Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ...

# Conflicts:
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info.h
#	src/data/pokemon/species_info/gen_1_families.h
#	src/data/pokemon/species_info/gen_2_families.h
#	src/data/pokemon/species_info/gen_4_families.h
#	src/data/pokemon/species_info/gen_5_families.h
#	src/data/pokemon/species_info/gen_8_families.h

2024-05-28 14:28:33 -04:00

..

battle_frontier

Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829

2023-08-31 14:28:01 -04:00

asm.inc

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

battle_anim_script.inc

Upgraded Dragon Darts Animation (#4620)

2024-05-28 10:17:52 +02:00

battle_script.inc

Merge branch '_RHH/master' into _RHH/upcoming

2024-05-27 10:13:42 -04:00

battle_tent.inc

Removed trailing spaces in the most relevant files

2021-08-24 19:59:32 -03:00

contest_ai_script.inc

Document contest AI scripts

2020-08-21 14:57:17 -04:00

event.inc

Moved callfuncs to general macros folder + added comments + removed unused "emote" macro

2024-05-22 13:52:26 -04:00

field_effect_script.inc

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

function.inc

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

m4a.inc

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

2022-04-02 18:45:18 -03:00

map.inc

Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers

2024-01-17 18:11:35 -03:00

movement.inc

Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers

2024-01-17 18:11:35 -03:00

music_voice.inc

Further removed trailing whitespaces

2022-09-13 16:26:36 -03:00

trainer_hill.inc

Clean up some trainer hill

2022-03-31 12:54:07 -04:00