Eduardo Quezada 39ed85635f Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers ...

# Conflicts:
#	include/data.h
#	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_3_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_6_families.h
#	src/data/pokemon/species_info/gen_7_families.h
#	src/data/pokemon/species_info/gen_8_families.h

2024-03-17 23:41:23 -03:00

..

layouts

Added dynamic palette support for virtual objects.

2022-08-17 19:58:46 -04:00

maps

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

2024-02-19 13:49:10 -03:00

scripts

Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers

2024-03-17 23:41:23 -03:00

text

Clean up contest strings (#3876)

2024-02-02 10:55:39 +01:00

tilesets

Merge branch 'master' into followers

2022-11-21 21:21:50 -05:00

battle_anim_scripts.s

Generic Starting Battle Status Variable (#4176)

2024-02-14 10:05:37 +01:00

battle_scripts_1.s

Fixed Tangling Hair + Mirror Armor interaction

2024-02-27 13:38:38 +09:00

battle_scripts_2.s

Merge branch '_RHH/master' into _RHH/upcoming

2024-02-10 17:53:32 -03:00

contest_ai_scripts.s

Incorporated upstream fixes

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

event_scripts.s

Whitespace, documentation and style

2024-01-22 19:12:52 -03:00

field_effect_scripts.s

Whitespace, documentation and style

2024-01-22 19:12:52 -03:00

map_events.s

Updated existing OW pokemon events with new system.

2023-01-12 21:45:42 -05:00

maps.s

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

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

mb_berry_fix.gba

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

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

mb_colosseum.gba

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

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

mb_ereader.gba

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

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

multiboot_berry_glitch_fix.s

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

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

multiboot_ereader.s

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

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

multiboot_pokemon_colosseum.s

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

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

mystery_event_script_cmd_table.s

Remove address comments

2021-07-20 15:18:31 -04:00

mystery_gift.s

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

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

script_cmd_table.inc

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

2024-02-13 20:35:05 -03:00

sound_data.s

Organized conffig files into their own folder and cleaned up

2022-11-14 11:03:49 -03:00

specials.inc

Pre-1.8 tweaks (#4275)

2024-03-12 12:21:03 +01:00