Hedara 594a4c7ec3 Merge commit 'dc077e50d3a2d52964a52ce9a9e81fd99586dd4f' into pret-merge ...

Conflicts:
	.github/workflows/build.yml
	asm/macros/battle_script.inc
	include/constants/battle_script_commands.h
	src/battle_controllers.c
	src/battle_script_commands.c
	src/data/graphics/battle_environment.h
	src/party_menu.c

2026-01-19 21:40:27 +01:00

..

bag

…

balls

Decouple Poke Ball ids from item ids (#5560)

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

battle_anims

Make rainbow effect anim change based on side (#8269)

2025-11-18 23:31:47 +01:00

battle_environment

Renamed building and stadium palettes to be more accurate

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

battle_frontier

Fix some frontier gfx, adjacent cleanup

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

battle_interface

Fixed bKGD for last_used_ball_r_cycle.png (#8261)

2025-11-16 12:52:07 +01:00

battle_transitions

Refactor mugshots (#4000)

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

berries

…

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

…

cave_transition

Fix CaveTransition pals

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

contest

…

credits

…

decorations

…

dexnav

…

diploma

…

dodrio_berry_picking

…

door_anims

…

easy_chat

…

evolution_scene

…

expansion_intro

…

field_effects

New Feature: ORAS Dowsing (#7211)

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

fonts

Fix nicknames containing many / overflowing the party screen textbox (#7970)

2025-10-17 20:17:35 +02:00

frontier_pass

…

interface

Update Move Category icons (#5080)

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

intro

…

items

Changes to Item icons and palettes (#8614)

2026-01-13 15:16:26 +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

Implement GSC berry/apricorn tree functionality. (#7777)

2025-11-14 20:28:55 +01:00

party_menu

…

picture_frame

…

pokeblock

…

pokedex

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

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

pokemon

Expansion OW sprites fix (#8633)

2025-12-24 15:56:17 +01:00

pokemon_jump

…

pokemon_storage

Added Japan-only Walda PC icons (#3550)

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

pokenav

Implement field_name_box (#7697)

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

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

…

starter_choose

…

summary_screen

IV/EV Info on Summary Screen (#6027)

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

text_window

Implement field_name_box (#7697)

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

title_screen

Lay out emerald version png horizontally

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

trade

…

trainer_card

…

trainer_hill

…

trainers

…

types

Add B_SHOW_TYPES and cleaned up IsDoubleBattle (#5131)

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

union_room_chat

…

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

…