Eduardo Quezada 98eb4e5027 Merge branch '_RHH/master' into _RHH/upcoming ...

# Conflicts:
#	asm/macros/battle_script.inc
#	include/constants/battle_string_ids.h
#	src/battle_ai_switch_items.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/frontier_util.c
#	test/battle/ai/ai.c

2024-07-19 09:20:05 -04:00

..

layouts

refactor: code review for expansion

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

maps

Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into masterintoupcoming18jun

2024-06-18 15:27:06 +02:00

scripts

Add release to debug scripts (#4782)

2024-06-13 07:38:41 +02:00

text

Revert "Guillotine: Decapitalize everything (#3949)" (#4525)

2024-05-13 19:19:37 +02:00

tilesets

Metatile + commas

2024-05-30 13:56:14 -04:00

battle_anim_scripts.s

Refactors residual damage (#4945)

2024-07-13 12:12:40 +02:00

battle_scripts_1.s

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-19 09:20:05 -04:00

battle_scripts_2.s

Clean up battle scripts (#4839)

2024-07-15 16:25:25 +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

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

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

field_effect_scripts.s

Whitespace, documentation and style

2024-01-22 19:12:52 -03: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

Remove unused callfunc

2024-06-02 10:53:45 -04:00

sound_data.s

Organized conffig files into their own folder and cleaned up

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

specials.inc

Pre-1.8 tweaks (#4275)

2024-03-12 12:21:03 +01:00