AlexOn1ine 33607529cd conflicts

2025-05-16 10:46:32 +02:00

..

bag

…

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

…

battle_frontier

…

battle_interface

Resized gimmick indicators to reduce VRAM usage (#6319)

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

battle_transitions

…

berries

…

berry_blender

…

berry_crush

…

berry_fix

…

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

…

fonts

Type Effectiveness Indicators when selecting moves (#6559)

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

frontier_pass

…

interface

…

intro

…

items

Decouple Poke Ball ids from item ids (#5560)

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

link

…

mail

…

map_popup

…

misc

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

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

naming_screen

…

object_events

…

party_menu

…

picture_frame

…

pokeblock

…

pokedex

…

pokemon

PokeCommunity sprites batch (April 2025) (#6840)

2025-05-16 09:35:30 +02:00

pokemon_jump

…

pokemon_storage

…

pokenav

…

rayquaza_scene

…

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

…

title_screen

Lay out emerald version png horizontally

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

trade

…

trainer_card

…

trainer_hill

…

trainers

…

types

…

union_room_chat

…

unused

…

wallclock

…

weather

…

wireless_status_screen

…

wonder_card

…

wonder_news

…