Eduardo Quezada ddc752eb14 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # asm/macros/event.inc # data/field_effect_scripts.s # data/maps/BattleFrontier_BattleTowerLobby/scripts.inc # data/script_cmd_table.inc # graphics/pokemon/castform/sunny/anim_front.png # graphics/pokemon/castform/sunny/normal.pal # include/battle_util.h # include/constants/event_object_movement.h # include/constants/field_effects.h # src/battle_controller_player.c # src/battle_util.c # src/data/object_events/movement_action_func_tables.h # src/data/object_events/object_event_pic_tables.h # src/data/trainer_graphics/back_pic_anims.h # src/daycare.c # src/event_object_movement.c # src/field_effect_helpers.c # src/load_save.c # src/scrcmd.c # src/trainer_see.c		2024-01-17 18:11:35 -03:00
..
pokecenter_monitor	Move more graphics out of misc	2022-01-14 12:29:30 -05:00
sand_pillar	Document more misc field effects	2020-06-29 16:32:46 -04:00
arrow.png
ash.png
ash_launch.png	Continue documenting overworld/field effects	2020-06-29 01:26:29 -04:00
ash_puff.png	Continue documenting overworld/field effects	2020-06-29 01:26:29 -04:00
bike_tire_tracks.png
bird.png
bubbles.png
bug_tracks.png	Added more follower footprint types. Credit: Sonikku-DatH	2022-02-07 23:06:38 -05:00
cut_grass.png
deep_sand_footprints.png
deoxys_rock_fragment_bottom_left.png	Apply palettes to some field effect pngs	2022-01-14 12:51:13 -05:00
deoxys_rock_fragment_bottom_right.png	Apply palettes to some field effect pngs	2022-01-14 12:51:13 -05:00
deoxys_rock_fragment_top_left.png	Apply palettes to some field effect pngs	2022-01-14 12:51:13 -05:00
deoxys_rock_fragment_top_right.png	Apply palettes to some field effect pngs	2022-01-14 12:51:13 -05:00
emote_x.png	Port pokefirered's Vs. Seeker to pokeemerald (#3256)	2023-11-26 18:58:43 +01:00
emotion_double_exclamation.png	Port pokefirered's Vs. Seeker to pokeemerald (#3256)	2023-11-26 18:58:43 +01:00
emotion_exclamation.png	Apply palettes to some field effect pngs	2022-01-14 12:51:13 -05:00
emotion_heart.png	Apply palettes to some field effect pngs	2022-01-14 12:51:13 -05:00
emotion_question.png	Apply palettes to some field effect pngs	2022-01-14 12:51:13 -05:00
field_move_streaks.bin	Move more graphics out of misc	2022-01-14 12:29:30 -05:00
field_move_streaks.png	Move more graphics out of misc	2022-01-14 12:29:30 -05:00
field_move_streaks_indoors.bin	Move more graphics out of misc	2022-01-14 12:29:30 -05:00
field_move_streaks_indoors.png	Move more graphics out of misc	2022-01-14 12:29:30 -05:00
ground_impact_dust.png
hof_monitor_big.png	Apply palettes to some field effect pngs	2022-01-14 12:51:13 -05:00
hof_monitor_small.png	Apply palettes to some field effect pngs	2022-01-14 12:51:13 -05:00
hot_springs_water.png
jump_big_splash.png	Continue documenting overworld/field effects	2020-06-29 01:26:29 -04:00
jump_long_grass.png	Name unknown_16.png	2022-03-14 15:54:47 -04:00
jump_small_splash.png	Continue documenting overworld/field effects	2020-06-29 01:26:29 -04:00
jump_tall_grass.png	Continue documenting overworld/field effects	2020-06-29 01:26:29 -04:00
long_grass.png
mountain_disguise.png
pokeball_glow.png	Apply palettes to some field effect pngs	2022-01-14 12:51:13 -05:00
record_mix_lights.png	Document more misc field effects	2020-06-29 16:32:46 -04:00
ripple.png
sand_disguise_placeholder.png
sand_footprints.png
sand_pile.png	Document some overworld and field effects	2020-06-23 15:48:53 -04:00
secret_power_cave.png	Document more misc field effects	2020-06-29 16:32:46 -04:00
secret_power_shrub.png	Document more misc field effects	2020-06-29 16:32:46 -04:00
secret_power_tree.png	Document more misc field effects	2020-06-29 16:32:46 -04:00
shadow_extra_large.png	Fixed shadow palette tag. Fully removed permanent shadows.	2022-02-21 15:54:49 -05:00
shadow_large.png	Fixed shadow palette tag. Fully removed permanent shadows.	2022-02-21 15:54:49 -05:00
shadow_medium.png	Fixed shadow palette tag. Fully removed permanent shadows.	2022-02-21 15:54:49 -05:00
shadow_small.png	Fixed shadow palette tag. Fully removed permanent shadows.	2022-02-21 15:54:49 -05:00
short_grass.png
slither_tracks.png	Added more follower footprint types. Credit: Sonikku-DatH	2022-02-07 23:06:38 -05:00
small_sparkle.png	Document some overworld and field effects	2020-06-23 15:48:53 -04:00
sparkle.png	Document some overworld and field effects	2020-06-23 15:48:53 -04:00
splash.png
spot_tracks.png	Added more follower footprint types. Credit: Sonikku-DatH	2022-02-07 23:06:38 -05:00
spotlight.png	Move more graphics out of misc	2022-01-14 12:29:30 -05:00
surf_blob.png
tall_grass.png
tree_disguise.png
unknown_17.png
unused_grass_2.png	Continue documenting overworld/field effects	2020-06-29 01:26:29 -04:00
unused_grass_3.png	Continue documenting overworld/field effects	2020-06-29 01:26:29 -04:00
unused_sand.png	Clean up field effect doc	2020-07-02 05:05:13 -04:00
water_surfacing.png	Continue documenting overworld/field effects	2020-06-29 01:26:29 -04:00