Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
pokeemmo/data/scripts
History
Eduardo Quezada 341ce6fd95 Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3 
# Conflicts:
#	.github/workflows/build.yml
#	README.md
#	gflib/sprite.c
#	graphics/pokemon/banette/anim_front.png
#	graphics/pokemon/banette/normal.pal
#	graphics/pokemon/sentret/normal.pal
#	graphics/pokemon/togetic/anim_front.png
#	graphics/pokemon/togetic/normal.pal
#	include/battle_script_commands.h
#	include/data.h
#	ld_script.txt
#	src/battle_controller_player.c
#	src/bike.c
#	src/event_object_movement.c
2023-06-16 21:25:16 -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
Fixed follower bugs when returning from a battle facility challenge.
2022-05-20 00:18:41 -04: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
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05: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
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04:00
debug.inc
Fixed compile issue when disabling overworld debug menu (#3024)
2023-05-24 08:24:44 -04:00
elite_four.inc
More updating event macro comments
2021-11-16 17:46:34 -05:00
field_move_scripts.inc
Added movements/scripts for overworld follower field moves.
2023-01-03 18:18:09 -05:00
field_poison.inc
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
flash.inc
Fixed object events not being unfrozen after using Flash.
2022-05-17 00:33:37 -04:00
follower.inc
Fixed some follower movements.
2022-10-22 18:50:27 -04:00
gabby_and_ty.inc
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05: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 branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-08-17 11:25:13 -07: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
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05: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
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04: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 remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04:00
secret_power_tm.inc
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05: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
Fixed bug with applymovement not hiding followers after a battle.
2023-03-13 17:51:35 -04: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