Hedara 4873589c65 Merge remote-tracking branch 'pret/master' into new-pret-merge ...

Conflicts:
	asm/macros/battle_script.inc
	data/battle_anim_scripts.s
	include/battle.h
	include/battle_controllers.h
	include/battle_setup.h
	include/constants/battle.h
	src/battle_anim_normal.c
	src/battle_anim_utility_funcs.c
	src/battle_bg.c
	src/battle_controllers.c
	src/battle_main.c
	src/battle_script_commands.c

2025-04-29 20:27:33 +02:00

..

layouts

refactor: code review for expansion

2024-05-17 20:45:32 -04:00

maps

Merge branch 'followers' into followers-expanded-id

2025-02-10 00:24:50 -05:00

scripts

Merge branch '_RHH/master' into _RHH/upcoming

2025-02-13 13:06:32 -03: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 metatile behavior

2024-07-25 20:23:04 -07:00

battle_anim_scripts.s

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

2025-04-29 20:27:33 +02:00

battle_scripts_1.s

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

2025-04-29 20:27:33 +02:00

battle_scripts_2.s

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

2025-02-09 00:54:58 +01: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

Merge remote-tracking branch 'upstream/master' into followers

2025-02-10 00:11:38 -05:00

field_effect_scripts.s

syntax, alignment fixes

2024-07-08 14:15:41 -04: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

Merge remote-tracking branch 'upstream/master' into followers

2025-02-10 00:11:38 -05: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 Code Entry functionality (#5951)

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