Eduardo Quezada 1fc712f153 Merge remote-tracking branch '_pret/master' into RHH/pr/upcoming/pret_20231210 ... # Conflicts: # Makefile # data/battle_scripts_1.s # gflib/malloc.c # gflib/malloc.h # include/battle.h # ld_script.ld # ld_script_modern.ld # src/battle_ai_script_commands.c # src/battle_main.c # src/battle_script_commands.c # src/battle_util.c # src/data/pokemon/species_info.h # src/pokemon.c		2023-12-10 13:27:09 -03:00
..
bag
balls
battle_anims	Adds combined pledge move effects (#3336)	2023-11-21 16:23:22 +01: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
berries
berry_blender
berry_crush
berry_fix	Correct berry fix graphics colors, more PLTT constant use (#1892)	2023-08-09 12:49:21 -04:00
birch_speech
cable_car
cave_transition
contest
credits
decorations
diploma
dodrio_berry_picking
door_anims
easy_chat
evolution_scene
expansion_intro
field_effects	Port pokefirered's Vs. Seeker to pokeemerald (#3256)	2023-11-26 18:58:43 +01:00
fonts	Merge remote-tracking branch '_pret/master' into RHH/pr/upcoming/pret_20231210	2023-12-10 13:27:09 -03:00
frontier_pass
interface
intro
items	Includes older item and move names as variants (#3580)	2023-11-20 18:35:00 +01:00
link
mail
map_popup
misc
naming_screen
object_events
party_menu
picture_frame
pokeblock
pokedex	Merge branch 'RHH/pr/upcoming/reorderMonGraphics' into RHH/review/gen9mon-4	2023-11-02 21:32:23 -04:00
pokemon	Merge remote-tracking branch '_pret/master' into RHH/pr/upcoming/pret_20231210	2023-12-10 13:27:09 -03:00
pokemon_jump
pokemon_storage	Added Japan-only Walda PC icons (#3550)	2023-11-18 00:54:13 +01:00
pokenav
rayquaza_scene
reset_rtc_screen
rotating_gates
roulette
shop
slot_machine
starter_choose
summary_screen
text_window
title_screen
trade
trainer_card
trainer_hill
trainers
types
union_room_chat
unused	Moved files - spinda spots, jp fonts, redyellowgreen_frame.bin	2023-11-12 14:28:11 +13:00
wallclock
weather
wireless_status_screen
wonder_card
wonder_news