Eduardo Quezada 00e2ca6030 Merge branch '_RHH/master' into _RHH/upcoming ...

# Conflicts:
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
#	src/battle_ai_util.c
#	src/battle_script_commands.c
#	src/battle_tv.c
#	src/data/battle_moves.h
#	src/data/pokemon/species_info/gen_9.h

2024-01-22 15:56:10 -03:00

..

layouts

Label unused layouts

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

maps

Merge branch '_RHH/master' into _RHH/upcoming

2024-01-19 09:34:05 -03:00

scripts

Item Ball refactor / Pluralize item names for giveitem and finditem (#3942)

2024-01-14 21:35:45 +01:00

text

Item Ball refactor / Pluralize item names for giveitem and finditem (#3942)

2024-01-14 21:35:45 +01:00

tilesets

Convert tilesets.s to C

2022-09-27 17:23:26 -04:00

battle_anim_scripts.s

A few new gen 9 move animations (#3989)

2024-01-16 19:33:49 -07:00

battle_scripts_1.s

Merge branch '_RHH/master' into _RHH/upcoming

2024-01-22 15:56:10 -03:00

battle_scripts_2.s

Fix item usage in double battles (#3977)

2024-01-15 21:55:35 +01:00

contest_ai_scripts.s

Incorporated upstream fixes

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

event_scripts.s

Item Ball refactor / Pluralize item names for giveitem and finditem (#3942)

2024-01-14 21:35:45 +01:00

field_effect_scripts.s

Port pokefirered's Vs. Seeker to pokeemerald (#3256)

2023-11-26 18:58:43 +01: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 remote-tracking branch 'pret/master' into feature/dynmulti

2023-04-24 18:30:30 +02:00

sound_data.s

Organized conffig files into their own folder and cleaned up

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

specials.inc

Add missing check to prevents water grinding

2023-12-08 01:05:54 +01:00