Eduardo Quezada f21953f254 Merge remote-tracking branch 'pret/master' into RHH/master

2023-07-06 13:06:31 -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

add snow weather

2023-05-02 16:25:26 +02:00

battle_anim.h

Replace launchtemplate and launchtask in battle anims (#2640)

2023-05-27 17:32:53 -04:00

battle_arena.h

…

battle_dome.h

…

battle_factory.h

…

battle_frontier_mons.h

…

battle_frontier_trainers.h

…

battle_frontier.h

…

battle_move_effects.h

ad suggested changes

2023-05-02 21:17:14 +02:00

battle_palace.h

…

battle_pike.h

…

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 'upcoming' into RHH/content/gen9SnowWeather

2023-05-07 17:27:58 +02:00

battle_tent_mons.h

…

battle_tent_trainers.h

…

battle_tent.h

…

battle_tower.h

…

battle.h

add snow weather

2023-05-02 16:25:26 +02:00

berry.h

…

cable_club.h

…

coins.h

…

contest.h

…

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

…

event_objects.h

Sync clone object macro

2023-02-08 13:11:10 -05:00

field_effects.h

…

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 #1871 from GriffinRichards/doc-trendy-sayings

2023-03-24 08:05:51 -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 branch 'master' of https://github.com/pret/pokeemerald into rhhpretmerge

2023-05-12 13:48:52 +02:00

heal_locations.h

…

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

Add Berserk Gene Item (#2893)

2023-04-25 15:03:57 -04:00

layouts.h

…

lilycove_lady.h

…

map_groups.h

…

map_scripts.h

…

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

…

pokemon.h

Fixed Sylveon's evolution method (#3048)

2023-06-19 16:17:51 -04:00

region_map_sections.h

…

rgb.h

add silk trap anim

2023-01-28 09:03:18 -05:00

roulette.h

…

script_menu.h

…

secret_bases.h

…

slot_machine.h

…

songs.h

Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319

2023-03-19 20:28:56 -03:00

sound.h

…

species.h

enamorus_t cry, basculegionf sprite, new typhlosion back sprite

2023-02-23 15:20:12 +01: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

…

trainer_types.h

…

trainers.h

[trainer_parties] implement fully customizable npc trainer parties

2023-03-25 20:00:04 +01:00

tv.h

Redefine TV_SHOWS_COUNT

2023-04-27 13:59:09 -04:00

union_room.h

…

vars.h

Document wonder news

2022-11-22 02:17:03 -05:00

weather.h

…

wild_encounter.h

…

z_move_effects.h

…