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

..

layouts

refactor: code review for expansion

2024-05-17 20:45:32 -04:00

maps

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

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

scripts

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

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

text

Revert "Guillotine: Decapitalize everything (#3949)" (#4525)

2024-05-13 19:19:37 +02:00

tilesets

Merge branch 'master' into followers

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

battle_anim_scripts.s

Upgraded Dragon Darts Animation (#4620)

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

battle_scripts_1.s

Merge branch '_RHH/master' into _RHH/upcoming

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

battle_scripts_2.s

Fix dire hit being used on incorrect target (#4626)

2024-05-26 00:06:55 +02:00

contest_ai_scripts.s

Incorporated upstream fixes

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

event_scripts.s

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

2024-04-20 13:23:14 -04: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-04-20 13:23:14 -04: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