Hedara 0a3d7a24db Merge commit 'c2dcc629fd97b3d58fedc07c9e02653eabed9136' into pret-merge ...

Conflicts:
	data/battle_anim_scripts.s
	data/script_cmd_table.inc
	include/fieldmap.h
	include/item.h
	include/party_menu.h
	src/battle_anim_ground.c
	src/fieldmap.c
	src/graphics.c
	src/item.c
	src/overworld.c
	src/party_menu.c

2026-07-29 16:04:30 +02:00

..

bag

…

balls

…

battle_anims

Add Gba-style Substitute (#8655)

2025-12-24 20:56:25 +01:00

battle_environment

Renamed building and stadium palettes to be more accurate

2026-01-18 18:19:03 -05:00

battle_frontier

…

battle_interface

feat (battle): improve gimmick triggers' graphics (#10129)

2026-06-03 08:06:40 +02:00

battle_transitions

…

berries

…

berry_blender

…

berry_crush

…

berry_fix

…

birch_speech

…

cable_car

…

cave_transition

…

contest

…

crash_screen

fatal_assertf (#10156)

2026-06-07 22:18:13 +02:00

credits

…

credits_frlg

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

decorations

…

dexnav

…

diploma

…

dodrio_berry_picking

…

door_anims

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

easy_chat

…

evolution_scene

…

expansion_intro

…

field_effects

Overworld Encounters (#8434)

2026-04-29 19:36:14 +02:00

field_specials

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

fonts

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

frontier_pass

…

interface

…

intro

…

intro_frlg

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

items

Merge branch 'master' into master-merge

2026-03-20 22:48:44 +01:00

link

…

mail

…

map_popup

…

map_preview

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

misc

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

naming_screen

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

oak_speech

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

object_events

Fix Kanto object event graphic names (#9537)

2026-03-22 19:48:24 +01:00

party_menu

…

picture_frame

…

pokeblock

…

pokedex

Fix Some HGSS Dex Visuals (#9534)

2026-03-18 13:24:16 +01:00

pokemon

Alolan and Mega Form Animation Frames (#10414)

2026-07-16 21:44:34 +02:00

pokemon_jump

…

pokemon_storage

…

pokenav

Add red and leaf icons to frlg map (#9357)

2026-02-27 11:24:16 +00:00

quickstart

fix(quickstart): adjust leafgreen hud palette for readability

2026-03-28 18:15:25 +05:30

rayquaza_scene

…

reset_rtc_screen

…

rotating_gates

…

roulette

…

seagallop

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

shop

…

slot_machine

…

ss_anne

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

starter_choose

…

summary_screen

…

text_window

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

title_screen

Rearrange press_start.png

2026-06-17 14:14:19 +01:00

title_screen_frlg

Add FRLG (#7423)

2026-01-28 17:41:12 +01:00

trade

…

trainer_card

…

trainer_hill

…

trainers

Refactor/trainer pic info (#9475)

2026-04-03 22:34:59 +02:00

types

…

union_room_chat

…

unused

…

wallclock

…

weather

…

wireless_status_screen

…

wonder_card

…

wonder_news

…