Eduardo Quezada d076193b9f Merge branch 'RHH/master' into RHH/upcoming ...

# Conflicts:
#	asm/macros/battle_script.inc
#	include/constants/battle.h
#	include/constants/battle_script_commands.h
#	src/battle_script_commands.c
#	src/data/battle_moves.h

2023-12-03 16:39:32 -03:00

..

layouts

Label unused layouts

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

maps

Incorporated upstream fixes

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

scripts

Fix issue where Sky Battles cause upcoming not to compile when debug menu is turned off (#3617)

2023-11-29 23:08:36 +01:00

text

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

2023-11-26 18:58:43 +01:00

tilesets

Convert tilesets.s to C

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

battle_anim_scripts.s

Adds combined pledge move effects (#3336)

2023-11-21 16:23:22 +01:00

battle_scripts_1.s

Merge branch 'RHH/master' into RHH/upcoming

2023-12-03 16:39:32 -03:00

battle_scripts_2.s

Remove all trailing whitespace (upcoming) (#3473)

2023-10-27 13:54:55 -03:00

contest_ai_scripts.s

Incorporated upstream fixes

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

event_scripts.s

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

2023-11-26 18:58:43 +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

Review changes

2023-02-15 13:56:11 -03:00

sound_data.s

Organized conffig files into their own folder and cleaned up

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

specials.inc

fix new line (#3621)

2023-11-30 20:01:21 -03:00