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
..
layouts
maps	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-01-17 18:11:35 -03:00
scripts	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-01-17 18:11:35 -03:00
text	Item Ball refactor / Pluralize item names for giveitem and finditem (#3942)	2024-01-14 21:35:45 +01:00
tilesets	Merge branch 'master' into followers	2022-11-21 21:21:50 -05:00
battle_anim_scripts.s	A few new gen 9 move animations (#3989)	2024-01-16 19:33:49 -07:00
battle_scripts_1.s	Adds Move Psychic Noise (#4005)	2024-01-16 22:52:56 +01:00
battle_scripts_2.s	Fix item usage in double battles (#3977)	2024-01-15 21:55:35 +01:00
contest_ai_scripts.s	Incorporated upstream fixes	2023-10-27 11:04:10 -03:00
event_scripts.s	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-01-17 18:11:35 -03:00
field_effect_scripts.s	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-01-17 18:11:35 -03:00
map_events.s	Updated existing OW pokemon events with new system.	2023-01-12 21:45:42 -05:00
maps.s
mb_berry_fix.gba
mb_colosseum.gba
mb_ereader.gba
multiboot_berry_glitch_fix.s
multiboot_ereader.s
multiboot_pokemon_colosseum.s
mystery_event_script_cmd_table.s
mystery_gift.s
script_cmd_table.inc	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-01-17 18:11:35 -03:00
sound_data.s	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03:00
specials.inc	Add missing check to prevents water grinding	2023-12-08 01:05:54 +01:00