Hedara dd17524fc9 Merge commit '7fd0029ed7b9a245f866b6a7467f6d0bd7c0f717' into pret-merge ...

sha1sum changed

 Conflicts:
	include/global.h
	include/overworld.h
	include/pokemon.h
	src/map_name_popup.c
	src/pokedex_area_screen.c
	src/pokemon.c

2025-11-01 15:09:20 +01:00

..

bard_music

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

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

battle_frontier

Master to upcoming merge

2025-05-26 10:41:11 +02:00

decoration

Remove compressed palettes (#6455)

2025-04-26 22:58:40 +02:00

easy_chat

Merge remote-tracking branch 'pret/master' into pret-merge-2025-02-11

2025-02-11 11:20:37 +01:00

field_effects

Add rock climb history from ghoul

2025-08-05 20:47:05 +02:00

graphics

Refactor battle environment (#4891)

2025-07-12 12:38:06 -04:00

object_events

Add rock climb history from ghoul

2025-08-05 20:47:05 +02:00

pokemon

Add camera-facing right-walking Krabby and Kingler follower sprites (#7881)

2025-10-26 11:45:40 +01:00

region_map

Merge commit '7fd0029ed7b9a245f866b6a7467f6d0bd7c0f717' into pret-merge

2025-11-01 15:09:20 +01:00

text

Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into pretmerge7aug

2024-08-07 12:42:45 +02:00

tilesets

Replace all usages of lz compression with smol (#7032)

2025-05-31 19:47:54 +02:00

.gitignore

Merge branch 'master' into master-to-upcoming

2025-05-28 14:26:15 +02:00

abilities.h

Adds missing breakable flag for Bulletproof (#7928)

2025-10-12 08:54:14 +02:00

battle_anim.h

New and polished battle animations (#7074)

2025-07-11 19:14:19 +02:00

battle_environment.h

Refactor battle environment (#4891)

2025-07-12 12:38:06 -04:00

battle_move_effects.h

Fixes Beat Up incorrect slots usage (#7741)

2025-09-17 11:40:40 +02:00

battle_partners.party

Restore AI: Basic Trainer to PARTNER_STEVEN (#7586)

2025-08-20 10:22:19 -04:00

battle_pool_rules.h

Trainer Party Pools (#5731)

2025-01-25 13:28:46 +01:00

contest_moves.h

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

contest_opponents.h

Consolidated contest opponent filters into gContestOpponents (#6119)

2025-01-26 23:12:49 +01:00

contest_text_tables.h

Clean up contest strings (#3876)

2024-02-02 10:55:39 +01:00

credits.h

Solved a bunch of -Wall errors on modern

2023-09-20 19:01:08 -03:00

debug_trainers.party

Debug parties and battles (#6884)

2025-06-03 23:21:17 +02:00

gimmicks.h

Gimmick Indicator refactor (#6553)

2025-04-10 23:56:26 +02:00

heal_locations.constants.json.txt

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

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

heal_locations.json

Update FRLG whiteouts to new pret system (#7040)

2025-06-08 14:45:14 +02:00

heal_locations.json.txt

Update FRLG whiteouts to new pret system (#7040)

2025-06-08 14:45:14 +02:00

item_icon_table.h

Test runner set mode (#4661)

2024-05-30 21:24:33 +02:00

items.h

Fix Persim Berry battle usage (#7963)

2025-10-17 22:57:18 +02:00

lilycove_lady.h

Consolidated Lilycove Contest Lady's values into one struct (#4951)

2024-07-13 14:44:22 +02:00

moves_info.h

Fix ruination and nature's madness damage percentage (#7983)

2025-10-19 20:37:43 +02:00

partner_parties.h

Make trainerproc compatible with partners (#4421)

2024-04-22 17:03:36 +02:00

party_menu.h

Refactor field moves (#6660)

2025-05-31 09:03:12 +02:00

pointillism_points.h

Solved a bunch of -Wall errors on modern

2023-09-20 19:01:08 -03:00

pokedex_area_glow.h

…

script_menu.h

Converts multi-choice options to COMPOUND_STRINGs (#5686)

2024-12-03 12:32:13 +01:00

trade.h

Replace all usages of lz compression with smol (#7032)

2025-05-31 19:47:54 +02:00

trainer_parties.h

Competitive-formatted parties (#3545)

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

trainers.party

Expand trainerproc to support additional battle types (#6770)

2025-05-17 15:08:44 +02:00

types_info.h

Easy customizable Hidden Move types (#5872)

2025-01-04 21:42:14 +01:00

union_room.h

Hide in-battle types from Union Room trade request (#6489)

2025-03-30 10:57:58 +02:00

wallpapers.h

Replace all usages of lz compression with smol (#7032)

2025-05-31 19:47:54 +02:00

wild_encounters.json

Final cleanup

2024-05-16 18:08:10 -04:00