Hedara 51a5577f65 Merge branch 'master' into master-upcoming ...

Conflicts:
	src/battle_controller_safari.c
	src/data/moves_info.h
	src/graphics.c

2025-06-25 14:17:07 +02:00

..

layouts

REVERT ME TO RESTORE HOENN MAP ADJUSTMENTS

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

maps

Merge remote-tracking branch 'pret/master' into pret-merge

2025-06-24 10:42:24 +02:00

scripts

Merge branch 'master' into master-upcoming

2025-06-25 14:17:07 +02: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

Master to upcoming merge, 20/06/25

2025-06-20 17:09:58 +02:00

battle_scripts_1.s

Merge branch 'master' into master-upcoming

2025-06-25 14:17:07 +02:00

battle_scripts_2.s

Use battler arguments for SetMoveEffect (#7156)

2025-06-23 15:26:31 +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

Refactor field moves (#6660)

2025-05-31 09:03:12 +02:00

field_effect_scripts.s

Remove trailing whitespace (#6968)

2025-05-23 22:33:12 +02: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

Refactor field moves (#6660)

2025-05-31 09:03:12 +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 Code Entry functionality (#5951)

2025-01-25 22:03:08 +01:00