Hedara 468454d810 Merge commit '51b000860be6d26da989c8b2e51a3f66c664083e' into pret-merge ...

Conflicts:
	src/battle_controllers.c
	src/battle_gfx_sfx_util.c

2025-05-15 21:38:57 +02:00

..

.gitignore

[Build System Rewrite] mapjson now takes output directory parameters. (#1949)

2024-08-29 14:01:01 -04:00

abilities.h

…

apprentice.h

…

battle_ai.h

Remove redundant AI defines (#6590)

2025-04-13 11:22:14 +02:00

battle_anim_scripts.h

…

battle_anim.h

Tachyon Cutter and Salt Cure animations (#6182)

2025-02-05 15:27:21 +01: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

Reverts wrongly done gem fix and renames struggle effect (#6806)

2025-05-15 10:45:48 +02: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

…

battle_script_commands.h

Fixes timesGotHit not increasing on forced switch out (#6493)

2025-03-29 19:33:50 +01:00

battle_setup.h

Trainer Battle Parameter Consolidation (#5982)

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

battle_string_ids.h

Toxic Spikes print whether the target is poisoned or badly poisoned (#6814)

2025-05-10 22:55:28 +02:00

battle_tent_mons.h

…

battle_tent_trainers.h

…

battle_tent.h

…

battle_tower.h

…

battle_z_move_effects.h

…

battle.h

Merge commit '51b000860be6d26da989c8b2e51a3f66c664083e' into pret-merge

2025-05-15 21:38:57 +02:00

berry.h

…

cable_club.h

…

characters.h

Added NBSP and up+down arrows to all fonts (#5767)

2024-12-07 07:26:23 -03: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

Renamed folders and symbols to match species defines (#5581)

2024-10-27 20:15:11 +01: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

Replace Incorrect Slow Stairs Movement with Correct One (#6275)

2025-03-16 14:51:36 -07:00

event_objects.h

Shifted the follower graphicsIds (#6329)

2025-02-23 22:11:41 +01:00

expansion.h

Start of 1.11.3 Cycle

2025-04-30 11:26:09 +02:00

field_effects.h

…

field_poison.h

…

field_specials.h

spaces over tabs please don't eat my ass

2024-08-14 22:14:48 -07:00

field_tasks.h

…

field_weather.h

…

flags.h

A lot of tests (#6734)

2025-05-07 16:50:12 +02:00

followers.h

…

form_change_types.h

Expanded Pokémon Follower transformation functionality (#5048)

2025-01-18 23:19:06 +01:00

frontier_util.h

…

game_stat.h

…

generational_changes.h

A lot of tests (#6734)

2025-05-07 16:50:12 +02:00

global.h

Switch chance config support (#6187)

2025-02-10 00:30:54 +01:00

heal_locations.h

FRLG+ whiteout message (#4967)

2024-08-02 08:28:05 -07:00

hold_effects.h

Turn item hold effects into an enum (#5498)

2024-10-10 14:23:59 +02:00

item_effects.h

…

item.h

…

items.h

Decouple Poke Ball ids from item ids (#5560)

2024-10-28 18:03:15 +01:00

lilycove_lady.h

…

map_scripts.h

…

map_types.h

Revert "Converts a bunch of defines to enums" (#6082)

2025-01-22 21:50:39 +01:00

maps.h

…

mauville_old_man.h

…

metatile_behaviors.h

merge w upcoming

2024-09-29 13:33:20 -04:00

metatile_labels.h

…

moves.h

…

mystery_gift.h

…

opponents.h

…

party_menu.h

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

2025-02-09 00:54:58 +01:00

pokedex.h

Moved pokedex flags to constants files andadded constants to header of event_scripts

2024-08-14 19:24:55 -07:00

pokemon_icon.h

…

pokemon_sprite_visualizer.h

…

pokemon.h

Add clarification for EVO_SCRIPT_TRIGGER_DMG (#6579)

2025-04-12 12:56:30 -04:00

region_map_sections.h

…

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

…

roulette.h

…

script_menu.h

…

secret_bases.h

…

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

…

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

Revert "Converts a bunch of defines to enums" (#6082)

2025-01-22 21:50:39 +01: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

Revert "Converts a bunch of defines to enums" (#6082)

2025-01-22 21:50:39 +01:00

tv.h

…

union_room.h

…

vars.h

Refactor testing flags and vars to not conflict with user ones (#6301)

2025-02-22 15:32:39 +01:00

weather.h

Debug menu and createmon additions/cleanup (#5994)

2025-01-11 10:07:47 +01:00

wild_encounter.h

merge w upcoming

2024-10-04 12:56:21 -04:00