AlexOn1ine 33607529cd conflicts

2025-05-16 10:46:32 +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

Standardize intro gfx names

2021-03-29 20:48:48 -04: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

conflicts

2025-05-16 10:46:32 +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