Eduardo Quezada f3bebcd12c Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge ...

# Conflicts:
#	include/battle_anim.h
#	include/global.h
#	include/pokemon.h
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h

2022-07-22 22:57:02 -04:00

..

layouts

Label unused layouts

2021-02-08 14:45:56 -05:00

maps

Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge

2022-07-22 22:57:02 -04:00

scripts

Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge

2022-07-22 22:57:02 -04:00

text

Merge pull request #1687 from SimplyBLGDev/patch-1

2022-06-18 11:04:39 -04:00

tilesets

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

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

battle_anim_scripts.s

Merge branch 'battle_engine' into BE_pretmerge

2022-07-20 08:50:30 -04:00

battle_scripts_1.s

Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5.

2022-07-20 10:33:18 -04:00

battle_scripts_2.s

Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync

2021-12-17 23:51:29 -08:00

contest_ai_scripts.s

Removed trailing spaces in the most relevant files

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

event_scripts.s

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

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

field_effect_scripts.s

Continue battle_transition documenting

2021-10-29 11:24:36 -04:00

map_events.s

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

2022-04-02 18:45:18 -03: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 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

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

sound_data.s

Extract voicegroups

2018-01-09 19:27:11 -06:00

specials.inc

Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync

2021-11-21 10:40:26 -08:00

tilesets.s

Organize map data

2017-11-10 12:39:00 -06:00