Eduardo Quezada 569749f9c2 Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers ...

# Conflicts:
#	Makefile
#	gflib/sprite.h
#	graphics/object_events/pics/pokemon/wailord.png
#	include/constants/event_objects.h
#	include/random.h
#	src/data/object_events/object_event_graphics.h
#	src/data/object_events/object_event_graphics_info.h
#	src/data/object_events/object_event_graphics_info_pointers.h
#	src/event_object_movement.c
#	src/random.c
#	src/scrcmd.c

2024-05-18 10:12:17 -04:00

..

abilities.h

Embody Aspect fixes (#4439)

2024-04-27 19:35:42 +02:00

apprentice.h

…

battle_ai.h

Couple comment changes (#4409)

2024-04-19 16:34:44 +02:00

battle_anim_scripts.h

Add many gen 8 move animations (#2861)

2023-06-21 13:19:54 -04:00

battle_anim.h

Punchier tera animation (#4507)

2024-05-07 07:59:52 -04:00

battle_arena.h

Fix typo

2022-08-11 12:09:38 -04:00

battle_dome.h

Battle Dome Automation (#3596)

2023-11-24 16:19:32 +01:00

battle_factory.h

…

battle_frontier_mons.h

…

battle_frontier_trainers.h

…

battle_frontier.h

Customizable FrontierMon Sets (#4313)

2024-03-29 08:47:17 +01:00

battle_move_effects.h

Adds move Spicy Extract (#4211)

2024-05-16 11:03:50 +02:00

battle_palace.h

Clean up pokemon/ball/dex mentions in comments

2023-12-12 19:02:36 +01:00

battle_partner.h

Partner Battle refactor (#3592)

2023-12-20 12:38:28 +01:00

battle_pike.h

Add some battle frontier constant usage

2022-06-09 12:57:28 -04:00

battle_pyramid.h

Misc field_specials cleanup

2023-02-01 11:48:55 -05:00

battle_script_commands.h

Explosion and Mind Blown / Steel Beam refactor (CFRU port) (#4516)

2024-05-12 11:41:18 -04:00

battle_setup.h

…

battle_string_ids.h

Merge branch '_RHH/master' into _RHH/upcoming

2024-05-05 19:50:12 -04:00

battle_tent_mons.h

…

battle_tent_trainers.h

…

battle_tent.h

Add some battle frontier constant usage

2022-06-09 12:57:28 -04:00

battle_tower.h

…

battle_z_move_effects.h

Removed some hardcoded move IDs (#3982)

2024-01-12 22:41:46 +01:00

battle.h

Remove and replace MOVE_EFFECT_SP_ATK_TWO_DOWN (#4557)

2024-05-12 15:07:43 +02:00

berry.h

Refactor growth time and add six stage toggle

2023-12-07 13:22:01 +01:00

cable_club.h

…

coins.h

…

contest.h

Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829

2023-08-31 14:28:01 -04:00

cries.h

Merge branch '_RHH/master' into _RHH/upcoming

2024-02-19 10:13:13 -03:00

daycare.h

Converts a bunch of #if to regular conditions (#4071)

2024-01-26 18:15:45 +01:00

decorations.h

…

easy_chat.h

Document the trendy saying word group

2023-03-13 15:58:40 -04:00

event_bg.h

…

event_object_movement.h

Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers

2024-02-17 23:40:08 -03:00

event_objects.h

Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers

2024-05-18 10:12:17 -04:00

expansion.h

Non-tagged release

2024-05-06 14:51:48 -04:00

field_effects.h

Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers

2024-02-17 23:40:08 -03:00

field_poison.h

…

field_specials.h

Clean up pokemon/ball/dex mentions in comments

2023-12-12 19:02:36 +01:00

field_tasks.h

…

field_weather.h

…

flags.h

FLAG_TEMP_HIDE_FOLLOWER is now an alias for FLAG_TEMP_E

2024-05-17 11:24:05 -04:00

form_change_types.h

Merge branch '_RHH/master' into _RHH/upcoming

2024-05-11 19:53:19 -04:00

frontier_util.h

…

game_stat.h

Rename GAME_STAT_FISHING_CAPTURES to GAME_STAT_FISHING_ENCOUNTERS

2023-06-05 14:15:07 +02:00

global.h

Merge branch '_RHH/master' into _RHH/upcoming

2024-05-15 09:58:21 -04:00

heal_locations.h

Add the HEAL_LOCATION_NONE constant

2022-06-03 14:59:01 +01:00

hold_effects.h

Change Ivy Cudgel to be based on Ogerpon form rather than held item (#3865)

2023-12-30 11:40:58 +01:00

item_effects.h

Add Teal Mask item, move, and ability data (#3349)

2023-10-08 15:56:09 -03:00

item.h

Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo (#4068)

2024-01-26 15:25:52 -03:00

items.h

Converts a bunch of #if to regular conditions (#4071)

2024-01-26 18:15:45 +01:00

layouts.h

…

lilycove_lady.h

…

map_groups.h

Erase ghost data in include/constants/map_groups.h

2022-09-09 00:40:30 +07:00

map_scripts.h

Small correction to map script comments

2021-10-13 23:24:10 -04:00

map_types.h

…

maps.h

Correct comment in maps.h

2023-01-18 11:54:06 -05:00

mauville_old_man.h

…

metatile_behaviors.h

Clarify MB_SEMI_DEEP_WATER name

2023-01-17 21:32:55 -05:00

metatile_labels.h

Remove non-existent tilesets from label comments and alphabetize

2024-01-18 14:31:04 -05:00

moves.h

Competitive-formatted parties (#3545)

2024-04-06 15:05:15 -03:00

mystery_gift.h

Document wonder news

2022-11-22 02:17:03 -05:00

opponents.h

Partner Battle refactor (#3592)

2023-12-20 12:38:28 +01:00

party_menu.h

Change Frostbite abbreviation from FSB to FRB (#4355)

2024-04-10 09:16:32 +02:00

pokedex.h

Add configs for measurement systems and decimal separators (#4183)

2024-02-14 10:17:23 +01:00

pokemon_debug.h

Centered follower sprite better in debug menu

2024-01-19 14:24:50 -03:00

pokemon.h

Terastallization (#4110)

2024-04-24 11:17:46 +02:00

region_map_sections.h

Synced Route 4 and 10's MapSec labels

2022-08-16 18:23:37 -04:00

rgb.h

add silk trap anim

2023-01-28 09:03:18 -05:00

roulette.h

…

script_menu.h

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

2024-01-05 00:32:21 +01:00

secret_bases.h

…

slot_machine.h

Label slot machine ids, fix GetPriceReduction

2021-11-16 15:43:52 -05:00

songs.h

Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319

2023-03-19 20:28:56 -03:00

sound.h

Fix CRY_MODE_ECHO

2021-11-10 11:59:15 -05:00

species.h

Competitive-formatted parties (#3545)

2024-04-06 15:05:15 -03:00

tms_hms.h

Reference TMs and HMs by move instead of number (#1732)

2023-08-09 10:51:01 -04:00

trade.h

Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214

2023-02-15 14:11:03 -03:00

trainer_hill.h

Fix some frontier gfx, adjacent cleanup

2023-08-03 11:15:15 -04:00

trainer_types.h

…

trainers.h

Competitive-formatted parties (#3545)

2024-04-06 15:05:15 -03:00

tv.h

Clean up pokemon/ball/dex mentions in comments

2023-12-12 19:02:36 +01:00

union_room.h

Fix names and constant usage for union room classes

2022-08-23 12:44:07 -04:00

vars.h

Add temp var aliases

2023-08-04 14:17:28 -04:00

weather.h

…

wild_encounter.h

Fishing Enhancements (#4343)

2024-04-16 22:53:50 +02:00