Eduardo Quezada ddc752eb14 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ...

# Conflicts:
#	asm/macros/event.inc
#	data/field_effect_scripts.s
#	data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
#	data/script_cmd_table.inc
#	graphics/pokemon/castform/sunny/anim_front.png
#	graphics/pokemon/castform/sunny/normal.pal
#	include/battle_util.h
#	include/constants/event_object_movement.h
#	include/constants/field_effects.h
#	src/battle_controller_player.c
#	src/battle_util.c
#	src/data/object_events/movement_action_func_tables.h
#	src/data/object_events/object_event_pic_tables.h
#	src/data/trainer_graphics/back_pic_anims.h
#	src/daycare.c
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/load_save.c
#	src/scrcmd.c
#	src/trainer_see.c

2024-01-17 18:11:35 -03:00

..

battle_terrain.h

Fix LZ compressed data alignment

2018-10-21 12:05:34 -05:00

berries.h

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

2022-04-02 18:45:18 -03:00

berry_fix.h

Correct berry fix graphics colors, more PLTT constant use (#1892)

2023-08-09 12:49:21 -04:00

decorations.h

Drop unnecessary decor prefix

2020-04-13 13:04:22 -04:00

intro_scene.h

Standardize intro gfx names

2021-03-29 20:48:48 -04:00

items.h

Add Indigo Disk item data (#3854)

2023-12-28 23:00:34 +01:00

mail.h

Fix LZ compressed data alignment

2018-10-21 12:05:34 -05:00

pokeballs.h

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

2022-04-02 18:45:18 -03:00

pokemon.h

Revert "Organized pokemon graphics by generation (#3868)" (#3959)

2024-01-10 15:49:58 -03:00

rayquaza_scene.h

Removed trailing spaces in the most relevant files

2021-08-24 19:59:32 -03:00

slot_machine.h

More slot machine data documentation

2020-07-28 14:29:44 -04:00

trainers.h

Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers

2024-01-17 18:11:35 -03:00