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
..
abilities.h	Added the basic data for the Gen. 9 Abilities	2022-12-02 23:01:22 -03:00
apprentice.h
battle_ai.h	Ported TheXaman's latest changes to the Debug Menu (#2815)	2023-07-18 09:17:03 +02:00
battle_anim_scripts.h	Add many gen 8 move animations (#2861)	2023-06-21 13:19:54 -04:00
battle_anim.h	[battle, anim] woodhammer animation overhaul (#3192)	2023-08-01 19:10:18 -04:00
battle_arena.h	Fix typo	2022-08-11 12:09:38 -04:00
battle_dome.h	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03:00
battle_factory.h
battle_frontier_mons.h
battle_frontier_trainers.h	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03:00
battle_frontier.h	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge	2022-07-22 22:57:02 -04:00
battle_move_effects.h	solve conflics	2023-08-07 14:25:30 +02:00
battle_palace.h
battle_pike.h	Add some battle frontier constant usage	2022-06-09 12:57:28 -04:00
battle_pyramid.h	Misc field_specials cleanup	2023-02-01 11:48:55 -05:00
battle_script_commands.h	merge w upcoming	2023-05-15 13:13:28 -04:00
battle_setup.h
battle_string_ids.h	Merge branch 'RHH/master' into RHH/upcoming	2023-08-02 01:18:07 -04:00
battle_tent_mons.h
battle_tent_trainers.h
battle_tent.h	Add some battle frontier constant usage	2022-06-09 12:57:28 -04:00
battle_tower.h
battle.h	Merge branch 'RHH/master' into RHH/upcoming	2023-07-25 14:38:53 -04:00
berry.h
cable_club.h	Document remaining overworld	2021-04-06 16:55:43 -04:00
coins.h
contest.h	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
daycare.h	Remove unused INHERITED_IV_COUNT define	2023-01-31 09:44:47 +01:00
decorations.h
easy_chat.h	Document the trendy saying word group	2023-03-13 15:58:40 -04:00
event_bg.h
event_object_movement.h	Clean up lock/unlock anim movement	2022-08-12 21:18:10 -04:00
event_objects.h	Sync clone object macro	2023-02-08 13:11:10 -05:00
field_effects.h	Continue battle_transition documenting	2021-10-29 11:24:36 -04:00
field_poison.h
field_specials.h	Misc field_specials cleanup	2023-02-01 11:48:55 -05:00
field_tasks.h
field_weather.h
flags.h	Merge pull request #1904 from GriffinRichards/temp-alias	2023-08-11 15:45:00 -04:00
form_change_types.h	reworked weather form reversion + added more tests	2023-05-16 16:24:25 -07:00
frontier_util.h
game_stat.h	Rename GAME_STAT_FISHING_CAPTURES to GAME_STAT_FISHING_ENCOUNTERS	2023-06-05 14:15:07 +02:00
global.h	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
heal_locations.h	Add the HEAL_LOCATION_NONE constant	2022-06-03 14:59:01 +01:00
hold_effects.h	Add Berserk Gene Item (#2893)	2023-04-25 15:03:57 -04:00
item_effects.h	Fix Ice Heal message	2023-04-25 19:38:47 +02:00
item.h	Added shiny rerolls to Lures + reverted repel var name	2022-09-12 10:21:57 -03:00
items.h	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
layouts.h
lilycove_lady.h	Merge branch 'master' into trailingSpaces	2021-09-23 21:39:21 -04:00
map_groups.h	Erase ghost data in include/constants/map_groups.h	2022-09-09 00:40:30 +07:00
map_scripts.h	Small correction to map script comments	2021-10-13 23:24:10 -04:00
map_types.h
maps.h	Correct comment in maps.h	2023-01-18 11:54:06 -05:00
mauville_old_man.h
metatile_behaviors.h	Clarify MB_SEMI_DEEP_WATER name	2023-01-17 21:32:55 -05:00
metatile_labels.h	Sort metatile labels alphabetically	2023-02-14 14:36:27 -05:00
moves.h	Added Psyblade and Hydro Steam	2023-03-17 09:25:39 -03:00
mystery_gift.h	Document wonder news	2022-11-22 02:17:03 -05:00
opponents.h
party_menu.h	Add Frostbite status	2023-04-22 18:23:08 +02:00
pokedex.h	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03:00
pokemon_debug.h	added option to view changes for front/back sprite picCoords and elevation live	2021-12-13 22:31:37 +01:00
pokemon.h	Mon graphics are now loaded depending on their availability	2023-07-07 14:36:30 -04:00
region_map_sections.h	Synced Route 4 and 10's MapSec labels	2022-08-16 18:23:37 -04:00
rgb.h	add silk trap anim	2023-01-28 09:03:18 -05:00
roulette.h
script_menu.h	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03:00
secret_bases.h
slot_machine.h	Label slot machine ids, fix GetPriceReduction	2021-11-16 15:43:52 -05:00
songs.h	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319	2023-03-19 20:28:56 -03:00
sound.h	Fix CRY_MODE_ECHO	2021-11-10 11:59:15 -05:00
species.h	enamorus_t cry, basculegionf sprite, new typhlosion back sprite	2023-02-23 15:20:12 +01:00
tms_hms.h	Reference TMs and HMs by move instead of number (#1732)	2023-08-09 10:51:01 -04:00
trade.h	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214	2023-02-15 14:11:03 -03:00
trainer_hill.h	Fix some frontier gfx, adjacent cleanup	2023-08-03 11:15:15 -04:00
trainer_types.h
trainers.h	Removed uses of F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED	2023-07-05 18:22:48 -04:00
tv.h	Redefine TV_SHOWS_COUNT	2023-04-27 13:59:09 -04:00
union_room.h	Fix names and constant usage for union room classes	2022-08-23 12:44:07 -04:00
vars.h	Add temp var aliases	2023-08-04 14:17:28 -04:00
weather.h	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03:00
wild_encounter.h	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
z_move_effects.h	move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check	2022-07-19 18:24:53 -04:00