Eduardo Quezada 55be15f690 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2 ...

# Conflicts:
#	include/config/pokemon.h

2023-01-04 16:19:57 -03:00

..

bag

…

balls

…

battle_anims

Newline fix

2023-01-01 10:31:09 -03:00

battle_frontier

Standardize judgement vs judgment spelling

2022-08-20 22:58:46 -04:00

battle_interface

Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20230103

2023-01-03 15:40:33 -03:00

battle_terrain

…

battle_transitions

Ignore num_tiles if it would truncate non-transparent tiles (#1729)

2022-08-18 23:07:25 -04:00

berries

…

berry_blender

…

berry_crush

…

berry_fix

…

birch_speech

…

cable_car

…

cave_transition

…

contest

…

credits

…

decorations

…

diploma

…

dodrio_berry_picking

…

door_anims

…

easy_chat

…

evolution_scene

…

field_effects

…

fonts

…

frontier_pass

…

interface

Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124

2022-11-24 15:36:00 -03:00

intro

…

items

…

link

Sync wireless improvements

2022-11-09 15:14:18 -05:00

mail

…

map_popup

…

misc

…

naming_screen

Split naming screen palettes/graphics, use correct image palettes, clean up

2022-08-09 09:27:28 -04:00

object_events

…

party_menu

…

picture_frame

Ignore num_tiles if it would truncate non-transparent tiles (#1729)

2022-08-18 23:07:25 -04:00

pokeblock

…

pokedex

…

pokemon

Merge branch 'RHH/upcoming' into RHH/pr/feature/palleteConversion2

2022-12-22 10:30:01 -03:00

pokemon_jump

…

pokemon_storage

…

pokenav

…

rayquaza_scene

…

reset_rtc_screen

…

rotating_gates

Color rotating gate pngs

2022-10-12 19:19:42 -04:00

roulette

…

shop

…

slot_machine

…

spinda_spots

…

starter_choose

…

summary_screen

…

text_window

…

title_screen

…

trade

…

trainer_card

…

trainer_hill

…

trainers

Generate trainer pic palettes from image

2022-09-05 16:09:45 -04:00

types

Update fairy.png

2022-08-27 22:42:05 -04:00

union_room_chat

…

unused

…

wallclock

…

weather

…

wireless_status_screen

Sync wireless improvements

2022-11-09 15:14:18 -05:00

wonder_card

…

wonder_news

…