Eduardo Quezada 0d5b00aaf2 Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829 ... # Conflicts: # README.md # data/battle_ai_scripts.s # data/battle_scripts_1.s # data/maps/BattleFrontier_Lounge7/scripts.inc # include/battle_anim.h # include/battle_message.h # include/constants/items.h # src/battle_ai_script_commands.c # src/battle_ai_switch_items.c # src/battle_anim_throw.c # src/battle_anim_utility_funcs.c # src/battle_controller_link_opponent.c # src/battle_controller_link_partner.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controller_player_partner.c # src/battle_controller_recorded_opponent.c # src/battle_controller_recorded_player.c # src/battle_controller_wally.c # src/battle_gfx_sfx_util.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/data/party_menu.h # src/data/pokemon/tmhm_learnsets.h # src/daycare.c # src/field_specials.c # src/hall_of_fame.c # src/party_menu.c # src/pokemon.c # src/tv.c		2023-08-31 14:28:01 -04:00
..
data	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
agb_flash_1m.c
agb_flash_le.c
agb_flash_mx.c
agb_flash.c
AgbRfu_LinkManager.c
apprentice.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
bard_music.c
battle_ai_main.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_ai_switch_items.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_ai_util.c	Use AI_DATA->holdEffects instead AI_GetHoldEffect	2023-08-10 16:24:29 +02:00
battle_anim_bug.c
battle_anim_dark.c
battle_anim_dragon.c
battle_anim_effects_1.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_anim_effects_2.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_anim_effects_3.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_anim_electric.c
battle_anim_fight.c
battle_anim_fire.c
battle_anim_flying.c
battle_anim_ghost.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_anim_ground.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_anim_ice.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_anim_mon_movement.c
battle_anim_mons.c
battle_anim_new.c
battle_anim_normal.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_anim_poison.c
battle_anim_psychic.c
battle_anim_rock.c
battle_anim_smokescreen.c
battle_anim_sound_tasks.c
battle_anim_status_effects.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_anim_throw.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_anim_utility_funcs.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_anim_water.c
battle_anim.c
battle_arena.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_bg.c
battle_controller_link_opponent.c	use GetBattlerParty in LoadMonSprite	2023-08-21 09:43:01 +02:00
battle_controller_link_partner.c	use GetBattlerParty in LoadMonSprite	2023-08-21 09:43:01 +02:00
battle_controller_opponent.c	fix conflicts	2023-08-28 13:55:45 +02:00
battle_controller_player_partner.c	solve conflicts	2023-08-29 10:41:05 +02:00
battle_controller_player.c	fix conflicts	2023-08-28 13:55:45 +02:00
battle_controller_recorded_opponent.c	use GetBattlerParty in LoadMonSprite	2023-08-21 09:43:01 +02:00
battle_controller_recorded_player.c	use GetBattlerParty in LoadMonSprite	2023-08-21 09:43:01 +02:00
battle_controller_safari.c	replace global usage of gActiveBattler in controller files	2023-08-07 12:51:58 +02:00
battle_controller_wally.c	Automatically update nickname buffer sizes	2023-08-08 16:28:09 -04:00
battle_controllers.c	fix conflicts	2023-08-28 13:55:45 +02:00
battle_debug.c
battle_dome.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_factory_screen.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_factory.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_gfx_sfx_util.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_interface.c	Poké Ball shortcut tweaks (#3254)	2023-08-26 12:58:51 -04:00
battle_intro.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_main.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_message.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_palace.c	Add temp var aliases	2023-08-04 14:17:28 -04:00
battle_pike.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_pyramid_bag.c
battle_pyramid.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_records.c
battle_script_commands.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_setup.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_tent.c	Add temp var aliases	2023-08-04 14:17:28 -04:00
battle_tower.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_transition_frontier.c
battle_transition.c
battle_tv.c
battle_util.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
battle_util2.c
battle_z_move.c	Merge branch 'RHH/master' into RHH/upcoming	2023-08-17 13:42:09 -04:00
berry_blender.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
berry_crush.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
berry_fix_graphics.c	Correct berry fix graphics colors, more PLTT constant use (#1892)	2023-08-09 12:49:21 -04:00
berry_fix_program.c	Correct berry fix graphics colors, more PLTT constant use (#1892)	2023-08-09 12:49:21 -04:00
berry_powder.c
berry_tag_screen.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
berry.c
bike.c
birch_pc.c
braille_puzzles.c	Add temp flag aliases	2023-08-03 15:55:06 -04:00
braille.c
cable_car.c	Using RGB color constants where appropiate	2023-07-31 15:33:14 -04:00
cable_club.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
clear_save_data_screen.c
clock.c
coins.c
confetti_util.c
contest_ai.c	Add MOD to match mod with powers of 2	2023-08-16 16:44:45 -04:00
contest_effect.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
contest_link_util.c
contest_link.c
contest_painting.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
contest_util.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
contest.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
coord_event_weather.c
credits.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
crt0.s
data.c
daycare.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
debug.c	Added a debug feature to hatch eggs (#3155)	2023-07-21 12:06:05 +02:00
decompress.c
decoration_inventory.c
decoration.c	Misc missing constant use	2023-08-10 01:42:18 -04:00
dewford_trend.c	Misc missing constant use	2023-08-10 01:42:18 -04:00
digit_obj_util.c
diploma.c
dodrio_berry_picking.c
dynamic_placeholder_text_util.c
easy_chat.c
egg_hatch.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
ereader_helpers.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
ereader_screen.c
event_data.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
event_object_lock.c
event_object_movement.c
evolution_graphics.c
evolution_scene.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
expansion_intro.c
faraway_island.c
field_camera.c
field_control_avatar.c
field_door.c
field_effect_helpers.c
field_effect.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
field_message_box.c
field_player_avatar.c
field_poison.c
field_region_map.c
field_screen_effect.c
field_special_scene.c
field_specials.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
field_tasks.c	Add temp var aliases	2023-08-04 14:17:28 -04:00
field_weather_effect.c
field_weather.c	Detect potential misalignment in modern	2023-07-24 19:42:56 +01:00
fieldmap.c	Merge branch 'RHH/master' into RHH/upcoming	2023-08-02 01:18:07 -04:00
fldeff_cut.c
fldeff_dig.c
fldeff_escalator.c
fldeff_flash.c
fldeff_misc.c
fldeff_rocksmash.c
fldeff_softboiled.c
fldeff_strength.c
fldeff_sweetscent.c
fldeff_teleport.c
fonts.c
frontier_pass.c
frontier_util.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
graphics.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
gym_leader_rematch.c
hall_of_fame.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
heal_location.c
hof_pc.c
image_processing_effects.c
international_string_util.c
intro_credits_graphics.c
intro.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
item_icon.c
item_menu_icons.c
item_menu.c	Merge remote-tracking branch 'pret/master' into 'rhh/master'	2023-07-25 19:49:18 +01:00
item_use.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
item.c	Removed the sTMHMMoves array and made TMs/HMs read moves from their secondaryId item field (#3243)	2023-08-21 12:49:17 +01:00
landmark.c
libgcnmultiboot.s
libisagbprn.c
librfu_intr.c
librfu_rfu.c	Misc missing constant use	2023-08-10 01:42:18 -04:00
librfu_sio32id.c
librfu_stwi.c
lilycove_lady.c
link_rfu_2.c	Misc missing constant use	2023-08-10 01:42:18 -04:00
link_rfu_3.c
link.c	Detect potential misalignment in modern	2023-07-24 19:42:56 +01:00
list_menu.c
load_save.c
lottery_corner.c
m4a_1.s
m4a_tables.c
m4a.c
mail_data.c
mail.c
main_menu.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
main.c
map_name_popup.c
match_call.c	Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer	2023-08-11 11:41:44 -04:00
math_util.c
mauville_old_man.c
menu_helpers.c
menu_specialized.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
menu.c
metatile_behavior.c
mini_printf.c
minigame_countdown.c
mirage_tower.c	Detect potential misalignment in modern	2023-07-24 19:42:56 +01:00
mon_markings.c
money.c
move_relearner.c
multiboot.c
mystery_event_menu.c
mystery_event_msg.c
mystery_event_script.c
mystery_gift_client.c
mystery_gift_link.c
mystery_gift_menu.c
mystery_gift_scripts.c
mystery_gift_server.c
mystery_gift_view.c
mystery_gift.c
naming_screen.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
new_game.c
option_menu.c
overworld.c	Fixed outstanding UB with -fanalyzer on modern	2023-07-21 15:51:03 -04:00
palette_util.c
palette.c	Misc missing constant use	2023-08-10 01:42:18 -04:00
party_menu.c	Removed the sTMHMMoves array and made TMs/HMs read moves from their secondaryId item field (#3243)	2023-08-21 12:49:17 +01:00
play_time.c
player_pc.c
pokeball.c	Merge remote-tracking branch 'pret/master' into 'rhh/master'	2023-07-25 19:49:18 +01:00
pokeblock_feed.c
pokeblock.c
pokedex_area_region_map.c	Detect potential misalignment in modern	2023-07-24 19:42:56 +01:00
pokedex_area_screen.c
pokedex_cry_screen.c
pokedex.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
pokemon_animation.c
pokemon_debug.c
pokemon_icon.c
pokemon_jump.c
pokemon_size_record.c
pokemon_storage_system.c	Merge branch 'RHH/master' into RHH/upcoming	2023-08-02 01:18:07 -04:00
pokemon_summary_screen.c	Removed the sTMHMMoves array and made TMs/HMs read moves from their secondaryId item field (#3243)	2023-08-21 12:49:17 +01:00
pokemon.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
pokenav_conditions_gfx.c	Detect potential misalignment in modern	2023-07-24 19:42:56 +01:00
pokenav_conditions_search_results.c
pokenav_conditions.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
pokenav_list.c
pokenav_main_menu.c
pokenav_match_call_data.c	Reference TMs and HMs by move instead of number (#1732)	2023-08-09 10:51:01 -04:00
pokenav_match_call_gfx.c
pokenav_match_call_list.c
pokenav_menu_handler_gfx.c
pokenav_menu_handler.c
pokenav_region_map.c	Detect potential misalignment in modern	2023-07-24 19:42:56 +01:00
pokenav_ribbons_list.c
pokenav_ribbons_summary.c
pokenav.c
post_battle_event_funcs.c
random.c	Merge branch 'RHH/master' into RHH/upcoming	2023-07-25 14:38:53 -04:00
rayquaza_scene.c	Detect potential misalignment in modern	2023-07-24 19:42:56 +01:00
record_mixing.c	Add temp var aliases	2023-08-04 14:17:28 -04:00
recorded_battle.c
region_map.c	Misc missing constant use	2023-08-10 01:42:18 -04:00
reload_save.c
reset_rtc_screen.c
reshow_battle_screen.c	start removing duplicate controller functions	2023-08-04 12:10:38 +02:00
roamer.c
rom_header_gf.c
rom_header.s
rotating_gate.c	Add temp var aliases	2023-08-04 14:17:28 -04:00
rotating_tile_puzzle.c
roulette.c
rtc.c
safari_zone.c
save_failed_screen.c
save_location.c
save.c
scanline_effect.c	Detect potential misalignment in modern	2023-07-24 19:42:56 +01:00
scrcmd.c
script_menu.c
script_movement.c
script_pokemon_util.c	Fix for wild double battles with an in-game partner (#3210)	2023-08-11 17:29:10 -04:00
script.c
secret_base.c	Misc missing constant use	2023-08-10 01:42:18 -04:00
shop.c
siirtc.c
slot_machine.c	More DISPLAY_WIDTH/HEIGHT constant usage	2023-08-10 01:42:38 -04:00
sound.c
start_menu.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
starter_choose.c
strings.c
task.c
test_runner_stub.c
text_input_strings.c
text_window.c
tileset_anims.c
tilesets.c
time_events.c
title_screen.c	More DISPLAY_WIDTH/HEIGHT constant usage	2023-08-10 01:42:38 -04:00
trade.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
trader.c
trainer_card.c
trainer_hill.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
trainer_pokemon_sprites.c
trainer_see.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
trig.c
tv.c	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
union_room_battle.c
union_room_chat.c
union_room_player_avatar.c
union_room.c
use_pokeblock.c
util.c	More DISPLAY_WIDTH/HEIGHT constant usage	2023-08-10 01:42:38 -04:00
walda_phrase.c
wallclock.c
wild_encounter.c
wireless_communication_status_screen.c
wonder_news.c