Hedara b0ccddac69 Merge branch 'master' into master-to-upcoming ...

Conflicts:
	include/constants/expansion.h

2025-11-03 11:11:07 +01:00

..

.gitignore

Generate heal location constants automatically, move data back to a single file.

2025-02-03 20:25:11 -05:00

abilities.h

feat: change defines in constants/abilities.h to an enum (#7006)

2025-09-29 21:35:09 +02:00

apprentice.h

…

battle_ai.h

11/08/25 Master to upcoming merge

2025-08-11 08:31:12 +02:00

battle_anim_scripts.h

…

battle_anim.h

Separates FRB and FRZ animations (#7611)

2025-08-28 19:07:08 +02:00

battle_arena.h

…

battle_dome.h

…

battle_factory.h

…

battle_frontier_mons.h

…

battle_frontier_trainers.h

…

battle_frontier.h

…

battle_move_effects.h

Combine Simple Beam and Worry Seed into one effect (#8039)

2025-10-29 15:20:12 +01:00

battle_palace.h

…

battle_partner.h

Adds B_VAR_DIFFICULTY and related functions READ DESC (#5337)

2025-01-04 14:25:03 +01:00

battle_pike.h

…

battle_pyramid.h

Improve Pyramid location documentaion

2024-12-05 18:25:27 -03:00

battle_script_commands.h

Grudge, Destiny Bond and FaintBattler refactor (#8072)

2025-10-30 23:14:02 +01:00

battle_setup.h

Trainer Battle Parameter Consolidation (#5982)

2025-01-25 22:02:39 +01:00

battle_string_ids.h

Grudge, Destiny Bond and FaintBattler refactor (#8072)

2025-10-30 23:14:02 +01:00

battle_tent_mons.h

…

battle_tent_trainers.h

…

battle_tent.h

…

battle_tower.h

…

battle_z_move_effects.h

…

battle.h

Grudge, Destiny Bond and FaintBattler refactor (#8072)

2025-10-30 23:14:02 +01:00

berry.h

…

cable_club.h

…

characters.h

Implement field_name_box (#7697)

2025-09-14 20:45:18 +02:00

coins.h

…

contest.h

Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan

2025-01-17 21:57:25 +01:00

cries.h

Converts more defines to enums and name unnamed enums (#7071)

2025-06-18 14:30:37 +02:00

daycare.h

…

decorations.h

…

difficulty.h

Adds B_VAR_DIFFICULTY and related functions READ DESC (#5337)

2025-01-04 14:25:03 +01:00

easy_chat.h

…

event_bg.h

…

event_object_movement.h

Rock climb by ghoulslash (#7432)

2025-08-03 14:52:07 +02:00

event_objects.h

Merge commit '75642625439306f0cc5aed81177dc191f0d5950e' into merrp-merge

2025-06-25 17:54:59 +02:00

expansion.h

Merge branch 'master' into master-to-upcoming

2025-11-03 11:11:07 +01:00

field_effects.h

New Feature: ORAS Dowsing (#7211)

2025-10-27 17:41:07 +01:00

field_move.h

Rock climb by ghoulslash (#7432)

2025-08-03 14:52:07 +02:00

field_poison.h

…

field_specials.h

Converts some defines to enums and name unnamed enums (#8019)

2025-10-23 18:06:29 +02:00

field_tasks.h

…

field_weather.h

Review comments

2025-04-11 11:37:36 +02:00

flags.h

Merge commit '1f2fe7396b68d82da356b93fca10cc5736d3159c' into merrp-merge

2025-06-25 17:20:38 +02:00

follower_npc.h

Better system for Follower NPC running frames (#7222)

2025-06-27 10:12:35 +02:00

followers.h

…

form_change_types.h

Moved some fields to BattlerState/PartyState (#7409)

2025-07-25 22:16:35 +02:00

frontier_util.h

…

game_stat.h

…

generational_changes.h

Fix badge boost not applying in gen1 and 2 (#8013)

2025-10-22 22:57:04 +02:00

global.h

Add making release build

2025-07-07 10:24:45 -10:00

heal_locations.h

Merge commit '07c897a' into pret-merge

2025-05-27 19:46:13 +02:00

hold_effects.h

Clean up for item hold effect refactor (#8014)

2025-10-30 21:07:37 +01:00

item_effects.h

Restore X item friendship increase (#7583)

2025-08-26 22:17:30 +02:00

item.h

Bag refactor3 + Ghoulslash's sorting feature port (#7330)

2025-07-29 10:47:32 +02:00

items.h

Untangled TMs and HMs from item ids (#7173)

2025-07-04 19:07:53 +02:00

lilycove_lady.h

…

map_scripts.h

…

map_types.h

Converts a bunch of defines to enums (#7041)

2025-06-02 15:54:37 +02:00

maps.h

Improve undefined map assembler messages (#2196)

2025-10-29 21:34:03 -04:00

mauville_old_man.h

…

metatile_behaviors.h

Rock climb by ghoulslash (#7432)

2025-08-03 14:52:07 +02:00

metatile_labels.h

…

moves.h

…

mystery_gift.h

…

opponents.h

…

party_menu.h

Add "Move Item" option in party menu (#6758)

2025-05-04 11:40:31 +02:00

pokedex.h

Converts more defines to enums and name unnamed enums (#7071)

2025-06-18 14:30:37 +02:00

pokemon_icon.h

…

pokemon_sprite_visualizer.h

…

pokemon.h

Add type enum (#8054)

2025-10-27 16:41:22 +00:00

regions.h

Fixed non-regional forms breeding incorrectly (#4985)

2025-02-03 17:03:29 +01:00

rematches.h

Fix trainer match call flags

2024-08-15 23:00:20 +02:00

rgb.h

A bit more of addressing

2025-01-17 19:25:29 -03:00

roulette.h

…

rtc.h

Moved time constants to dedicated files (#7019)

2025-05-30 16:39:01 +02:00

script_menu.h

…

secret_bases.h

…

siirtc.h

Moved time constants to dedicated files (#7019)

2025-05-30 16:39:01 +02:00

slot_machine.h

…

songs.h

Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan

2025-01-17 21:57:25 +01:00

sound.h

Added CRY_MODE_DYNAMAX (#6933)

2025-06-30 09:45:09 -07:00

speaker_names.h

Implement field_name_box (#7697)

2025-09-14 20:45:18 +02:00

species.h

Rename Furfrou Species tags to match Pokemon Showdown exports (#6041)

2025-01-17 14:39:52 -03:00

tms_hms.h

…

trade.h

Converts a bunch of defines to enums (#7041)

2025-06-02 15:54:37 +02:00

trainer_hill.h

…

trainer_slide.h

Removed Trainer Slides footgun (#6205)

2025-02-07 13:30:57 +01:00

trainer_types.h

…

trainers.h

Converts a bunch of defines to enums (#7041)

2025-06-02 15:54:37 +02:00

tv.h

…

union_room.h

…

vars.h

Make B_VAR_STARTING_STATUS tests run in CI (#7419)

2025-07-28 13:11:04 +02:00

weather.h

Evolution Refactor (#6556)

2025-04-23 16:01:33 +02:00

wild_encounter.h

Update fishing odds to match official games (#7574)

2025-10-04 09:05:28 -07:00