Eduardo Quezada 6b79c7772c Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909 ...

# Conflicts:
#	src/battle_interface.c

2022-09-16 11:56:50 -03:00

..

layouts

Label unused layouts

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

maps

Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909

2022-09-16 11:56:50 -03:00

scripts

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

2022-09-13 16:22:42 -03: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

Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909

2022-09-16 11:56:50 -03:00

battle_scripts_1.s

Further removed trailing whitespaces

2022-09-13 16:26:36 -03: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 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh

2022-08-29 19:13:11 +02: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