Eduardo Quezada 92301398bc Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax ... # Conflicts: # asm/macros/battle_script.inc # data/battle_anim_scripts.s # data/battle_scripts_1.s # include/battle.h # include/battle_controllers.h # include/battle_interface.h # include/config/battle.h # include/constants/battle.h # include/constants/battle_anim.h # include/constants/battle_move_effects.h # include/constants/battle_string_ids.h # include/data.h # include/random.h # sound/cry_tables.inc # src/battle_anim_new.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controller_player_partner.c # src/battle_interface.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/data/pokemon/form_change_table_pointers.h # src/data/pokemon/species_info.h # src/data/text/move_names.h # test/test_runner_battle.c		2023-10-09 16:51:41 -03:00
..
bag	Colorize bag select button	2023-05-10 00:33:43 -04:00
balls
battle_anims	Add new Substitute doll sprites (#3263)	2023-09-04 19:48:43 -03:00
battle_frontier	Fix some frontier gfx, adjacent cleanup	2023-08-03 11:15:15 -04:00
battle_interface	Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax	2023-10-09 16:51:41 -03:00
battle_terrain
battle_transitions	Fix some compressed tilemaps	2023-06-01 15:31:12 -04:00
berries	Purged the bKGD warning once and for all	2023-02-24 02:01:55 -03:00
berry_blender
berry_crush	Fix some colors in crusher.png	2023-01-12 19:04:49 -05:00
berry_fix	Correct berry fix graphics colors, more PLTT constant use (#1892)	2023-08-09 12:49:21 -04:00
birch_speech
cable_car	Use tilemap file for cable car pylons	2023-03-31 00:44:22 -04:00
cave_transition
contest	Fix results_screen/tiles.png colors	2023-01-15 12:04:29 -05:00
credits
decorations
diploma
dodrio_berry_picking	Fix swapped Dodrio Berry Picking palettes	2023-06-05 19:53:59 -04:00
door_anims	Colorize door animations that use multiple palettes	2023-01-11 13:31:17 -05:00
easy_chat
evolution_scene
expansion_intro	Purged the bKGD warning once and for all	2023-02-24 02:01:55 -03:00
field_effects
fonts
frontier_pass	Correct colors for frontier_pass	2023-01-13 02:25:23 -05:00
interface	Add Frostbite status	2023-04-22 18:23:08 +02:00
intro	Fix intro/scene_1 tiles	2023-01-14 00:48:58 -05:00
items	Tera Shards Icons (#3307)	2023-09-14 07:38:45 -03:00
link	Sync wireless improvements	2022-11-09 15:14:18 -05:00
mail
map_popup
misc	Colorize mirage_tower.png	2023-01-12 11:40:15 -05:00
naming_screen	Split naming screen palettes/graphics, use correct image palettes, clean up	2022-08-09 09:27:28 -04:00
object_events	Purged the bKGD warning once and for all	2023-02-24 02:01:55 -03:00
party_menu	Fix party_menu/bg colors	2023-01-14 12:32:54 -05:00
picture_frame	Colorize picture_frame tiles	2023-01-13 15:30:57 -05:00
pokeblock	Fix some compressed tilemaps	2023-06-01 15:31:12 -04:00
pokedex	Added dark mode	2023-09-17 17:08:21 +05:30
pokemon	Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax	2023-10-09 16:51:41 -03:00
pokemon_jump
pokemon_storage	Colorize pokemon storage tiles	2023-01-15 00:39:51 -05:00
pokenav
rayquaza_scene	Colorize rayquaza_scene/scene_1/clouds.png	2023-01-12 14:56:44 -05:00
reset_rtc_screen
rotating_gates	Color rotating gate pngs	2022-10-12 19:19:42 -04:00
roulette
shop
slot_machine	Fix slot_machine/menu colors	2023-01-14 16:34:14 -05:00
spinda_spots	Support plain pixel conversion, convert spinda spots to .png	2023-05-11 13:41:38 -04:00
starter_choose	Colorize and combine birch_bag/birch_grass	2023-01-12 15:22:23 -05:00
summary_screen	Correct colors in summary_screen/tiles.png	2023-01-12 21:41:06 -05:00
text_window
title_screen
trade
trainer_card	Move FRLG trainer card gfx to own folder, fix tiles	2023-01-13 13:40:13 -05:00
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	Correct some union room chat documentation	2023-02-02 11:41:02 -05:00
unused
wallclock
weather
wireless_status_screen	Sync wireless improvements	2022-11-09 15:14:18 -05:00
wonder_card
wonder_news