ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
5b498e968f
pokeemerald/data/scripts
History
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
..
abnormal_weather.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
apprentice.inc Use STR_VAR names for apprentice_buff and frontier_gettrainername 2021-11-18 23:20:05 -05:00
battle_pike.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
berry_blender.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
berry_tree.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
cable_club.inc Add temp var aliases 2023-08-04 14:17:28 -04:00
cave_hole.inc Remove address comments 2021-07-20 15:18:31 -04:00
cave_of_origin.inc Add CRY_MODE constants 2021-11-07 13:33:05 -05:00
check_furniture.inc Remove address comments 2021-07-20 15:18:31 -04:00
contest_hall.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
day_care.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
debug.inc Added a debug feature to hatch eggs (#3155) 2023-07-21 12:06:05 +02:00
elite_four.inc More updating event macro comments 2021-11-16 17:46:34 -05:00
field_move_scripts.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
field_poison.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
flash.inc More updating event macro comments 2021-11-16 17:46:34 -05:00
gabby_and_ty.inc Add temp flag aliases 2023-08-03 15:55:06 -04:00
gift_altering_cave.inc Fix inconsistent static s/g names 2022-05-17 14:00:02 -04:00
gift_aurora_ticket.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
gift_battle_card.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
gift_mystic_ticket.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
gift_old_sea_map.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
gift_pichu.inc Updated term to modernFatefulEncounter 2023-02-11 22:36:42 -03:00
gift_stamp_card.inc Add STR_VAR_# ids to string buffer macros 2021-11-17 22:00:44 -05:00
gift_trainer.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
hall_of_fame.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
interview.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
item_ball_scripts.inc Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829 2023-08-31 14:28:01 -04:00
kecleon.inc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
lilycove_lady.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
mauville_man.inc Document the trendy saying word group 2023-03-13 15:58:40 -04:00
move_tutors.inc Removed tutor move distinction, combined llists 2022-08-25 19:56:47 -04:00
movement.inc Rename movement scripts to use Faster over Fastest 2021-11-05 02:22:28 +08:00
new_game.inc Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
obtain_item.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
pc_transfer.inc Add temp var aliases 2023-08-04 14:17:28 -04:00
pc.inc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
pkmn_center_nurse.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
players_house.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
prof_birch.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
profile_man.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
questionnaire.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
record_mix.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
repel.inc Fixed reusable repels/lures function forcefully using items while menu config is on 2023-01-04 00:00:13 -03:00
rival_graphics.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
roulette.inc Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
safari_zone.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
secret_base.inc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
secret_power_tm.inc Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
set_gym_trainers.inc Remove address comments 2021-07-20 15:18:31 -04:00
shared_secret_base.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
std_msgbox.inc Continue updating event macro comments 2021-11-16 13:10:23 -05:00
surf.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
test_signpost.inc Remove address comments 2021-07-20 15:18:31 -04:00
trainer_battle.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
trainer_hill.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
trainer_script.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
tv.inc Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00