Hedara 726f18f360 Merge remote-tracking branch 'pret/master' into pret-merge ...

Conflicts:
	asm/macros/event.inc
	data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
	data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
	data/scripts/trainer_hill.inc
	include/graphics.h

2025-06-24 10:42:24 +02:00

..

battle_environment.h

Merge branch 'master' into master-upcoming-2025-04-30

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

berries.h

Remove compressed palettes (#6455)

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

berry_fix.h

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

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

decorations.h

Remove compressed palettes (#6455)

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

gimmicks.h

Fix potential compile error caused by sTeraIndicatorDataPtrs (#6599)

2025-04-13 19:06:44 +02:00

intro_scene.h

Match graphics declarations with externs (#2089)

2025-06-23 20:31:18 +01:00

items.h

Remove compressed palettes (#6455)

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

mail.h

Fix LZ compressed data alignment

2018-10-21 12:05:34 -05:00

pokeballs.h

Remove compressed palettes (#6455)

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

pokemon.h

Merge branch 'master' into master-upcoming

2025-05-22 15:41:08 +02:00

rayquaza_scene.h

Remove compressed palettes (#6455)

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

slot_machine.h

More slot machine data documentation

2020-07-28 14:29:44 -04:00

trainers.h

Remove compressed palettes (#6455)

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