Hedara 0eeba00d1b Merge branch 'master' into master-upcoming-2025-04-30 ...

Conflicts:
	include/battle.h
	include/constants/expansion.h
	include/graphics.h
	src/battle_bg.c
	src/battle_util.c
	src/data/graphics/battle_terrain.h
	src/data/graphics/pokemon.h
	src/pokeblock_feed.c
	src/pokemon_sprite_visualizer.c

2025-04-30 15:22:37 +02:00

..

bag

Colorize bag select button

2023-05-10 00:33:43 -04:00

balls

Decouple Poke Ball ids from item ids (#5560)

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

battle_anims

Replaced Blue Sky background for Rock Field (#6516)

2025-04-07 11:04:21 +02:00

battle_environment

Rename battle terrain to environment

2024-07-13 12:02:18 +02:00

battle_frontier

Fix some frontier gfx, adjacent cleanup

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

battle_interface

Resized gimmick indicators to reduce VRAM usage (#6319)

2025-02-22 12:28:53 -03:00

battle_transitions

Refactor mugshots (#4000)

2024-01-16 00:45:13 +01:00

berries

Purged the bKGD warning once and for all

2023-02-24 02:01:55 -03:00

berry_blender

…

berry_crush

…

berry_fix

Correct berry fix graphics colors, more PLTT constant use (#1892)

2023-08-09 12:49:21 -04:00

birch_speech

remove sBirchSpeechPlatformBlackPal (#2075)

2024-12-13 17:39:51 -05:00

cable_car

Use tilemap file for cable car pylons

2023-03-31 00:44:22 -04:00

cave_transition

Fix CaveTransition pals

2025-01-15 10:08:02 +01:00

contest

Fix results_screen/tiles.png colors

2023-01-15 12:04:29 -05:00

credits

…

decorations

…

dexnav

…

diploma

…

dodrio_berry_picking

Fix swapped Dodrio Berry Picking palettes

2023-06-05 19:53:59 -04:00

door_anims

…

easy_chat

…

evolution_scene

…

expansion_intro

Purged the bKGD warning once and for all

2023-02-24 02:01:55 -03:00

field_effects

merge in original dexnav code with some rhh specific tweaks

2024-06-16 10:39:28 -04:00

fonts

Type Effectiveness Indicators when selecting moves (#6559)

2025-04-12 01:03:45 +02:00

frontier_pass

Correct colors for frontier_pass

2023-01-13 02:25:23 -05:00

interface

Update Move Category icons (#5080)

2024-09-09 09:52:48 +02:00

intro

Fix intro/scene_1 tiles

2023-01-14 00:48:58 -05:00

items

Decouple Poke Ball ids from item ids (#5560)

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

link

…

mail

…

map_popup

preproc assets, move config to overworld config, add some antialiasing to graphics, consistency in naming gens

2024-05-07 23:58:29 -04:00

misc

Merge remote-tracking branch 'pret/master' into new-pret-merge

2025-04-29 20:27:33 +02:00

naming_screen

…

object_events

Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2

2024-08-25 17:54:28 +10:00

party_menu

Fix party_menu/bg colors

2023-01-14 12:32:54 -05:00

picture_frame

Colorize picture_frame tiles

2023-01-13 15:30:57 -05:00

pokeblock

Fix some compressed tilemaps

2023-06-01 15:31:12 -04:00

pokedex

Merge remote-tracking branch '_pret_origin/master' into _RHH/pr/master/pret_20240526

2024-05-26 18:34:26 -04:00

pokemon

New Lurantis animation (#6725)

2025-04-30 12:45:29 +02:00

pokemon_jump

…

pokemon_storage

Added Japan-only Walda PC icons (#3550)

2023-11-18 00:54:13 +01:00

pokenav

…

rayquaza_scene

Removed old checksum matching workaround (#5480)

2024-10-08 14:02:31 +02:00

reset_rtc_screen

…

rotating_gates

…

roulette

…

shop

…

slot_machine

Fix slot_machine/menu colors

2023-01-14 16:34:14 -05:00

starter_choose

…

summary_screen

IV/EV Info on Summary Screen (#6027)

2025-01-20 09:41:31 +01:00

text_window

merge w upcoming

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

title_screen

Lay out emerald version png horizontally

2024-11-04 15:40:10 -05:00

trade

…

trainer_card

Move FRLG trainer card gfx to own folder, fix tiles

2023-01-13 13:40:13 -05:00

trainer_hill

…

trainers

…

types

Add B_SHOW_TYPES and cleaned up IsDoubleBattle (#5131)

2024-08-11 17:55:51 +02:00

union_room_chat

Correct some union room chat documentation

2023-02-02 11:41:02 -05:00

unused

Moved files - spinda spots, jp fonts, redyellowgreen_frame.bin

2023-11-12 14:28:11 +13:00

wallclock

…

weather

…

wireless_status_screen

…

wonder_card

…

wonder_news

…