Eduardo Quezada 51b716c9d9 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319 ... # Conflicts: # data/battle_scripts_2.s # include/constants/battle_string_ids.h # include/constants/songs.h # src/battle_message.c # src/data/pokemon/species_info.h		2023-03-19 20:28:56 -03:00
..
config	Updated the debug menu	2023-03-08 15:27:22 -03:00
constants	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319	2023-03-19 20:28:56 -03:00
gba
agb_flash.h
AgbRfu_LinkManager.h
apprentice.h
bard_music.h
battle_ai_main.h
battle_ai_switch_items.h
battle_ai_util.h
battle_anim.h
battle_arena.h
battle_bg.h
battle_controllers.h
battle_debug.h
battle_dome.h
battle_factory_screen.h
battle_factory.h
battle_gfx_sfx_util.h
battle_interface.h	alpha omega indicator sprites use the same palete	2023-03-06 15:22:28 +01:00
battle_main.h
battle_message.h	Fix bugs related to Trainer Slide messages (#2699)	2023-02-27 09:11:25 +01:00
battle_pike.h
battle_pyramid_bag.h
battle_pyramid.h
battle_records.h
battle_script_commands.h	Fix Protean / Libero when AI calculates Damage (#2714)	2023-03-07 09:34:26 +01:00
battle_scripts.h	Add tests for Defog and fix Defog battle strings (#2737)	2023-03-06 20:35:08 +01:00
battle_setup.h
battle_tent.h
battle_tower.h
battle_transition_frontier.h
battle_transition.h
battle_tv.h
battle_util.h
battle_util2.h
battle_z_move.h	End of file	2023-02-28 00:09:43 -03:00
battle.h	Updated Supreme Overlord's effect's code	2023-03-07 19:14:38 -03:00
berry_blender.h
berry_crush.h
berry_fix_program.h
berry_powder.h
berry_tag_screen.h
berry.h
bike.h
braille_puzzles.h
cable_club.h
clear_save_data_menu.h
clock.h
coins.h
confetti_util.h
config.h
contest_ai.h
contest_effect.h
contest_link.h
contest_painting.h
contest_util.h
contest.h
coord_event_weather.h
credits.h
crt0.h
data.h	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303	2023-03-03 11:00:50 -03:00
daycare.h
debug.h
decompress.h
decoration_inventory.h
decoration.h
dewford_trend.h
digit_obj_util.h
diploma.h
dodrio_berry_picking.h
dynamic_placeholder_text_util.h
easy_chat.h
egg_hatch.h
ereader_helpers.h
ereader_screen.h
event_data.h
event_object_lock.h
event_object_movement.h
event_scripts.h
evolution_graphics.h
evolution_scene.h
expansion_intro.h
faraway_island.h
field_camera.h
field_control_avatar.h
field_door.h
field_effect_helpers.h
field_effect.h
field_message_box.h
field_player_avatar.h
field_poison.h
field_screen_effect.h
field_special_scene.h
field_specials.h
field_tasks.h
field_weather.h
fieldmap.h
fldeff_misc.h
fldeff.h
fonts.h
frontier_pass.h
frontier_util.h
global.berry.h
global.fieldmap.h
global.h	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319	2023-03-19 20:28:56 -03:00
global.tv.h
graphics.h	Merge branch 'rh-hideout:upcoming' into PLA_missing_sprites	2023-03-13 17:46:53 +01:00
gym_leader_rematch.h
hall_of_fame.h
heal_location.h
image_processing_effects.h
international_string_util.h
intro_credits_graphics.h
intro.h
item_icon.h
item_menu_icons.h
item_menu.h
item_use.h
item.h
landmark.h
libgcnmultiboot.h
librfu.h
lilycove_lady.h
link_rfu.h
link.h
list_menu.h
load_save.h
lottery_corner.h
m4a.h
mail.h
main_menu.h
main.h
map_name_popup.h
match_call.h
math_util.h
mauville_old_man.h
menu_helpers.h
menu_specialized.h
menu.h
metatile_behavior.h
mini_printf.h
minigame_countdown.h
mirage_tower.h
mon_markings.h
money.h
move_relearner.h
multiboot_pokemon_colosseum.h
multiboot.h
mystery_event_menu.h
mystery_event_msg.h
mystery_event_script.h
mystery_gift_client.h
mystery_gift_link.h
mystery_gift_menu.h
mystery_gift_server.h
mystery_gift_view.h
mystery_gift.h
naming_screen.h
new_game.h
option_menu.h
overworld.h
palette_util.h
palette.h
party_menu.h
pc_screen_effect.h
play_time.h
player_pc.h
pokeball.h
pokeblock.h
pokedex_area_region_map.h
pokedex_area_screen.h
pokedex_cry_screen.h
pokedex.h
pokemon_animation.h
pokemon_debug.h
pokemon_icon.h
pokemon_jump.h
pokemon_size_record.h
pokemon_storage_system.h
pokemon_summary_screen.h
pokemon.h	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303	2023-03-03 11:00:50 -03:00
pokenav.h
random.h
rayquaza_scene.h
record_mixing.h
recorded_battle.h
region_map.h
reload_save.h
reset_rtc_screen.h
reshow_battle_screen.h
roamer.h
rotating_gate.h
rotating_tile_puzzle.h
roulette.h
rtc.h
safari_zone.h
save_location.h
save.h
scanline_effect.h
script_menu.h
script_movement.h
script_pokemon_util.h
script.h
secret_base.h
shop.h
siirtc.h
slot_machine.h
sound.h
start_menu.h
starter_choose.h
strings.h
task.h
test_runner.h
text_window.h
tileset_anims.h
tilesets.h
time_events.h
title_screen.h
trade.h
trader.h
trainer_card.h
trainer_hill.h
trainer_pokemon_sprites.h
trainer_see.h
trig.h
tv.h
union_room_battle.h
union_room_chat.h
union_room_player_avatar.h
union_room.h
util.h
walda_phrase.h
wallclock.h
wild_encounter.h
wonder_news.h