Hedara a2ef3284dd Merge branch 'master' into master-to-upcoming ...

Conflicts:
	data/battle_scripts_1.s
	include/battle_util.h
	include/constants/battle.h
	src/battle_script_commands.c
	src/battle_util.c

2025-10-29 18:42:59 +01:00

..

layouts

REVERT ME TO RESTORE HOENN MAP ADJUSTMENTS

2024-12-21 11:00:27 -03:00

maps

Master to upcoming merge

2025-10-25 16:19:32 +02:00

scripts

New Feature: ORAS Dowsing (#7211)

2025-10-27 17:41:07 +01:00

text

Add caught mon to full party by sending a different mon to the Box (#6058)

2025-02-09 00:54:58 +01:00

tilesets

REVERT ME TO RESTORE HOENN MAP ADJUSTMENTS

2024-12-21 11:00:27 -03:00

battle_anim_scripts.s

15/10/25 Master to upcoming merge

2025-10-15 21:31:00 +02:00

battle_scripts_1.s

Merge branch 'master' into master-to-upcoming

2025-10-29 18:42:59 +01:00

battle_scripts_2.s

Decouple passive hp updates from move damage updates (#7942)

2025-10-19 16:40:13 +02:00

contest_ai_scripts.s

Move general config file to the config folder (#4805)

2024-06-19 13:42:01 +02:00

event_scripts.s

Banned species list (#8003)

2025-10-23 21:29:33 +02:00

field_effect_scripts.s

New Feature: ORAS Dowsing (#7211)

2025-10-27 17:41:07 +01:00

map_events.s

Updated existing OW pokemon events with new system.

2023-01-12 21:45:42 -05: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

Bugfix hidefollower not waiting properly (#7768)

2025-10-19 16:39:07 +02:00

sound_data.s

Add config options for removing bard phoneme audio to save ROM space (#7155)

2025-06-18 20:16:25 -07:00

specials.inc

Add new actions to Debug Menu (#7837)

2025-10-03 20:26:49 +02:00