pokeemerald/src
Eduardo Quezada 64f82cdd5f Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/battle_ai_util.c
#	src/battle_util.c
2024-06-11 08:12:03 -04:00
..
data Merge branch '_RHH/master' into _RHH/upcoming 2024-06-11 08:12:03 -04:00
agb_flash_1m.c
agb_flash_le.c
agb_flash_mx.c
agb_flash.c
AgbRfu_LinkManager.c
apprentice.c
bard_music.c
battle_ai_main.c Use AI_DATA->abilities in more places (#4729) 2024-06-06 16:27:07 +02:00
battle_ai_switch_items.c Use AI_DATA->abilities in more places (#4729) 2024-06-06 16:27:07 +02:00
battle_ai_util.c Merge branch '_RHH/master' into _RHH/upcoming 2024-06-11 08:12:03 -04:00
battle_anim_bug.c
battle_anim_dark.c
battle_anim_dragon.c Upgraded Dragon Darts Animation (#4620) 2024-05-28 10:17:52 +02:00
battle_anim_effects_1.c ally switch fix elevation shadow and direction on opposing side (#4451) 2024-04-26 16:54:23 +02:00
battle_anim_effects_2.c
battle_anim_effects_3.c Punchier tera animation (#4507) 2024-05-07 07:59:52 -04:00
battle_anim_electric.c
battle_anim_fight.c
battle_anim_fire.c
battle_anim_flying.c
battle_anim_ghost.c
battle_anim_ground.c
battle_anim_ice.c
battle_anim_mon_movement.c
battle_anim_mons.c
battle_anim_new.c Upgraded Dragon Darts Animation (#4620) 2024-05-28 10:17:52 +02:00
battle_anim_normal.c
battle_anim_poison.c Merge remote-tracking branch '_pret_origin/master' into _RHH/pr/master/pret_20240526 2024-05-26 18:34:26 -04:00
battle_anim_psychic.c
battle_anim_rock.c
battle_anim_smokescreen.c Restore sassy nature effect (#4598) 2024-05-19 11:43:28 +02:00
battle_anim_sound_tasks.c Fixes cries in move animations ignoring Illusion (#4564) 2024-05-14 13:34:36 +02:00
battle_anim_status_effects.c
battle_anim_throw.c
battle_anim_utility_funcs.c
battle_anim_water.c
battle_anim.c Refactor move animations (#4683) 2024-06-02 08:18:13 +02:00
battle_arena.c
battle_bg.c Move Descriptions in battle (#4152) 2024-05-31 12:10:03 +02:00
battle_controller_link_opponent.c
battle_controller_link_partner.c
battle_controller_opponent.c Terastallization (#4110) 2024-04-24 11:17:46 +02:00
battle_controller_player_partner.c Fix partner palette problem (#4736) 2024-06-07 21:05:16 +02:00
battle_controller_player.c In battle move descriptions index fix (#4678) 2024-05-31 15:54:51 +02:00
battle_controller_recorded_opponent.c
battle_controller_recorded_player.c
battle_controller_safari.c
battle_controller_wally.c
battle_controllers.c
battle_debug.c
battle_dome.c Consolidate natures (#4562) 2024-05-19 10:14:31 +02:00
battle_dynamax.c Merge branch '_RHH/master' into _RHH/upcoming 2024-06-01 19:55:53 -04:00
battle_factory_screen.c
battle_factory.c
battle_gfx_sfx_util.c Move Descriptions in battle (#4152) 2024-05-31 12:10:03 +02:00
battle_interface.c Move Descriptions in battle (#4152) 2024-05-31 12:10:03 +02:00
battle_intro.c
battle_main.c Merge branch '_RHH/master' into _RHH/upcoming 2024-06-11 08:12:03 -04:00
battle_message.c Merge branch '_RHH/master' into _RHH/upcoming 2024-05-31 12:04:33 -04:00
battle_palace.c
battle_pike.c
battle_pyramid_bag.c
battle_pyramid.c
battle_records.c
battle_script_commands.c Merge branch '_RHH/master' into _RHH/upcoming 2024-06-11 08:12:03 -04:00
battle_setup.c Adds 1 vs 2 macro (#4741) 2024-06-08 09:49:28 +02:00
battle_tent.c
battle_terastal.c Add FORM_CHANGE_BATTLE_TERASTALLIZATION + allow species to force tera types (#4438) 2024-06-04 13:38:49 +02:00
battle_tower.c Merge branch '_RHH/master' into _RHH/upcoming 2024-06-11 08:12:03 -04:00
battle_transition_frontier.c
battle_transition.c
battle_tv.c Remove and replace MOVE_EFFECT_SP_ATK_TWO_DOWN (#4557) 2024-05-12 15:07:43 +02:00
battle_util.c Merge branch '_RHH/master' into _RHH/upcoming 2024-06-11 08:12:03 -04:00
battle_util2.c
battle_z_move.c
berry_blender.c
berry_crush.c
berry_fix_graphics.c
berry_fix_program.c
berry_powder.c
berry_tag_screen.c
berry.c Fix possible agbcc corruption for tree mutations (#4535) 2024-05-09 16:22:17 +02:00
bike.c
birch_pc.c
braille_puzzles.c
braille.c
cable_car.c
cable_club.c
clear_save_data_screen.c
clock.c
coins.c
confetti_util.c
contest_ai.c
contest_effect.c
contest_link_util.c
contest_link.c
contest_painting.c
contest_util.c Removed duplicated object event tags 2024-05-28 14:16:34 -04:00
contest.c Enable GF species names by default 2024-04-25 18:40:37 +01:00
coord_event_weather.c
credits.c
crt0.s
data.c
daycare.c Merge branch '_RHH/master' into _RHH/upcoming 2024-06-11 08:12:03 -04:00
debug.c Consolidate natures (#4562) 2024-05-19 10:14:31 +02:00
decompress.c Make Pokémon Sprite Visualizer name official (#4745) 2024-06-09 12:12:35 -04:00
decoration_inventory.c
decoration.c Revert NUM_DECORATION_FLAGS definition 2024-05-22 14:17:11 -04:00
dewford_trend.c
digit_obj_util.c
diploma.c
dodrio_berry_picking.c
dynamic_placeholder_text_util.c
easy_chat.c Revert "Guillotine: Decapitalize everything (#3949)" (#4525) 2024-05-13 19:19:37 +02:00
egg_hatch.c Merge branch '_RHH/master' into _RHH/upcoming 2024-06-04 16:47:29 -04:00
ereader_helpers.c
ereader_screen.c
event_data.c
event_object_lock.c
event_object_movement.c Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 2024-06-01 20:17:19 -04:00
evolution_graphics.c
evolution_scene.c
expansion_intro.c
faraway_island.c
field_camera.c
field_control_avatar.c
field_door.c
field_effect_helpers.c More style fixes 2024-05-18 14:36:06 -04:00
field_effect.c Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 2024-05-18 10:12:17 -04:00
field_message_box.c Revert "Guillotine: Decapitalize everything (#3949)" (#4525) 2024-05-13 19:19:37 +02:00
field_player_avatar.c
field_poison.c
field_region_map.c
field_screen_effect.c
field_special_scene.c
field_specials.c Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-05-28 14:28:33 -04:00
field_tasks.c
field_weather_effect.c
field_weather.c BW2 Style Map Pop-Ups (#4396) 2024-06-09 16:03:41 -04:00
fieldmap.c
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
follower_helper.c Moved message counts to their own file + remove unneeded include 2024-05-21 22:04:22 -04:00
fonts.c Merge branch '_RHH/master' into _RHH/upcoming 2024-05-15 09:58:21 -04:00
frontier_pass.c
frontier_util.c Change Battle Frontier validation to species flag (#4341) 2024-05-03 13:32:06 -04:00
graphics.c Move Descriptions in battle (#4152) 2024-05-31 12:10:03 +02:00
gym_leader_rematch.c
hall_of_fame.c Enable GF species names by default 2024-04-25 18:40:37 +01:00
heal_location.c
hof_pc.c
image_processing_effects.c
international_string_util.c
intro_credits_graphics.c
intro.c
item_ball.c
item_icon.c Follow up to #4579: wrong naming (#4591) 2024-05-18 17:05:25 +02:00
item_menu_icons.c
item_menu.c Enable GF item names by default 2024-04-25 18:40:37 +01:00
item_use.c fixed potential undefined behaviour when using escape rope (#4705) 2024-06-03 00:58:24 +02:00
item.c Get rid of gItemIconTable (#4579) 2024-05-18 10:22:26 +02:00
landmark.c
level_caps.c fix and tweak level cap code (#4505) 2024-05-07 15:53:09 +02:00
libgcnmultiboot.s
libisagbprn.c
librfu_intr.c
librfu_rfu.c
librfu_sio32id.c
librfu_stwi.c
lilycove_lady.c
link_rfu_2.c
link_rfu_3.c
link.c
list_menu.c Narrower fonts 2024-04-25 18:40:37 +01:00
load_save.c
lottery_corner.c
m4a_1.s
m4a_tables.c
m4a.c
mail_data.c
mail.c
main_menu.c Revert "Guillotine: Decapitalize everything (#3949)" (#4525) 2024-05-13 19:19:37 +02:00
main.c Merge branch '_RHH/master' into _RHH/upcoming 2024-05-15 09:58:21 -04:00
map_name_popup.c Merge remote-tracking branch 'ravepossum/bsbob_map_popups' into _RHH/pr/upcoming/bwPopupMergeFix 2024-06-09 16:34:11 -04:00
match_call.c
math_util.c
mauville_old_man.c
menu_helpers.c
menu_specialized.c Enable GF move names by default 2024-04-25 18:40:37 +01:00
menu.c BW2 Style Map Pop-Ups (#4396) 2024-06-09 16:03:41 -04:00
metatile_behavior.c
mini_printf.c
minigame_countdown.c
mirage_tower.c Removed duplicated object event tags 2024-05-28 14:16:34 -04: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 branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-05-16 17:31:46 -04:00
new_game.c
option_menu.c Revert "Guillotine: Decapitalize everything (#3949)" (#4525) 2024-05-13 19:19:37 +02:00
overworld.c
palette_util.c
palette.c
party_menu.c Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-05-16 17:31:46 -04:00
play_time.c
player_pc.c Enable GF item names by default 2024-04-25 18:40:37 +01:00
pokeball.c
pokeblock_feed.c Consolidate natures (#4562) 2024-05-19 10:14:31 +02:00
pokeblock.c
pokedex_area_region_map.c
pokedex_area_screen.c
pokedex_cry_screen.c
pokedex_plus_hgss.c Merge branch '_RHH/master' into _RHH/upcoming 2024-06-11 08:12:03 -04:00
pokedex.c Set TYPE_NONE as type 0 + other type data tweaks (#4462) 2024-06-01 07:38:22 +02:00
pokemon_animation.c Consolidate natures (#4562) 2024-05-19 10:14:31 +02:00
pokemon_icon.c Make Pokémon Sprite Visualizer name official (#4745) 2024-06-09 12:12:35 -04:00
pokemon_jump.c
pokemon_size_record.c
pokemon_sprite_visualizer.c Make Pokémon Sprite Visualizer name official (#4745) 2024-06-09 12:12:35 -04:00
pokemon_storage_system.c Merge branch '_RHH/master' into _RHH/upcoming 2024-05-27 10:13:42 -04:00
pokemon_summary_screen.c Make Pokémon Sprite Visualizer name official (#4745) 2024-06-09 12:12:35 -04:00
pokemon.c Merge branch '_RHH/master' into _RHH/upcoming 2024-06-11 08:12:03 -04:00
pokenav_conditions_gfx.c
pokenav_conditions_search_results.c Enable GF species names by default 2024-04-25 18:40:37 +01:00
pokenav_conditions.c Enable GF species names by default 2024-04-25 18:40:37 +01:00
pokenav_list.c
pokenav_main_menu.c
pokenav_match_call_data.c
pokenav_match_call_gfx.c
pokenav_match_call_list.c
pokenav_menu_handler_gfx.c
pokenav_menu_handler.c
pokenav_region_map.c
pokenav_ribbons_list.c Enable GF species names by default 2024-04-25 18:40:37 +01:00
pokenav_ribbons_summary.c Enable GF species names by default 2024-04-25 18:40:37 +01:00
pokenav.c
post_battle_event_funcs.c
random.c Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 2024-06-01 20:17:19 -04:00
rayquaza_scene.c More style fixes 2024-05-18 14:36:06 -04:00
record_mixing.c
recorded_battle.c
region_map.c Revert "Guillotine: Decapitalize everything (#3949)" (#4525) 2024-05-13 19:19:37 +02:00
reload_save.c
reset_rtc_screen.c
reshow_battle_screen.c
roamer.c
rom_header_gf.c
rom_header_rhh.c
rom_header.s
rotating_gate.c Removed duplicated object event tags 2024-05-28 14:16:34 -04:00
rotating_tile_puzzle.c
roulette.c
rtc.c PR feedback - 32 bit params, multiline condition formatting 2024-06-03 00:10:10 -04:00
safari_zone.c
save_failed_screen.c
save_location.c
save.c
scanline_effect.c
scrcmd.c Remove unused callfunc 2024-06-02 10:53:45 -04:00
script_menu.c Dynamic Multichoice no longer plays sound on init (#4480) 2024-05-09 08:44:22 +02:00
script_movement.c
script_pokemon_util.c Set TYPE_NONE as type 0 + other type data tweaks (#4462) 2024-06-01 07:38:22 +02:00
script.c
secret_base.c
shop.c Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-05-06 16:03:29 -04:00
siirtc.c
slot_machine.c
sound.c
sprays.c
start_menu.c Revert "Guillotine: Decapitalize everything (#3949)" (#4525) 2024-05-13 19:19:37 +02:00
starter_choose.c
strings.c BW2 Style Map Pop-Ups (#4396) 2024-06-09 16:03:41 -04:00
task.c
test_runner_stub.c
text_input_strings.c
text_window.c
tileset_anims.c
tilesets.c
time_events.c
title_screen.c
trade.c
trader.c
trainer_card.c
trainer_hill.c
trainer_pokemon_sprites.c
trainer_see.c Removed duplicate tags 2024-05-28 14:58:26 -04:00
trig.c
tv.c VANILLA_POKEMON_NAME_LENGTH 2024-04-25 18:40:37 +01:00
union_room_battle.c
union_room_chat.c
union_room_player_avatar.c
union_room.c
use_pokeblock.c Consolidate natures (#4562) 2024-05-19 10:14:31 +02:00
util.c
vs_seeker.c
walda_phrase.c
wallclock.c
wild_encounter.c Remove misleading preprocs (#4718) 2024-06-04 10:47:11 +02:00
wireless_communication_status_screen.c
wonder_news.c