Eduardo Quezada 5403cd036e Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 ...

# Conflicts:
#	include/battle.h
#	include/battle_controllers.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c

2022-09-02 23:24:08 -04:00

..

layouts

Label unused layouts

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

maps

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

2022-09-02 23:24:08 -04:00

scripts

Removed tutor move distinction, combined llists

2022-08-25 19:56:47 -04:00

text

Fixed instances of .string being used with spaces instead of tabs

2022-08-15 14:32:01 -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

Added Legends: Arceus' move data

2022-08-30 19:32:44 -03:00

battle_scripts_1.s

Merge pull request #2260 from DizzyEggg/magic_bounce

2022-09-01 19:56:15 -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

Incorporate commented bug fixes in contest AI scripts

2022-08-19 19:45:15 -04: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

Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms

2022-08-22 17:27:21 -04:00

specials.inc

Fixed battle frontier tutors (for real this time)

2022-08-27 22:45:10 -04:00

tilesets.s

Organize map data

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