AlexOn1ine 3c632b8b44 19-03-25 master to upcoming merge

2025-03-19 17:12:47 +01:00

..

.gitignore

…

abilities.h

…

apprentice.h

…

battle_ai.h

Fixed AI not handling type effectiveness beyond x8 (#6127)

2025-01-28 19:16:10 +01:00

battle_anim_scripts.h

…

battle_anim.h

Tachyon Cutter and Salt Cure animations (#6182)

2025-02-05 15:27:21 +01: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

Minor Recoil Effect refactor (#6409)

2025-03-14 12:43:45 +01:00

battle_palace.h

…

battle_partner.h

Adds B_VAR_DIFFICULTY and related functions READ DESC (#5337)

2025-01-04 14:25:03 +01:00

battle_pike.h

…

battle_pyramid.h

…

battle_script_commands.h

19-03-25 master to upcoming merge

2025-03-19 17:12:47 +01:00

battle_setup.h

Trainer Battle Parameter Consolidation (#5982)

2025-01-25 22:02:39 +01:00

battle_string_ids.h

Added Dynamax/Gigantamax battle messages (#6440)

2025-03-17 19:16:43 +01:00

battle_tent_mons.h

…

battle_tent_trainers.h

…

battle_tent.h

…

battle_tower.h

…

battle_z_move_effects.h

…

battle.h

Merge branch 'master' into final-1.10-master-upcoming-merge

2025-02-26 22:07:10 +01:00

berry.h

…

cable_club.h

…

characters.h

…

coins.h

…

contest.h

Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan

2025-01-17 21:57:25 +01:00

cries.h

…

daycare.h

…

decorations.h

…

difficulty.h

Adds B_VAR_DIFFICULTY and related functions READ DESC (#5337)

2025-01-04 14:25:03 +01:00

easy_chat.h

…

event_bg.h

…

event_object_movement.h

Replace Incorrect Slow Stairs Movement with Correct One (#6275)

2025-03-16 14:51:36 -07:00

event_objects.h

Shifted the follower graphicsIds (#6329)

2025-02-23 22:11:41 +01:00

expansion.h

Start of 1.12 cycle

2025-02-27 14:34:58 +01:00

field_effects.h

…

field_poison.h

…

field_specials.h

…

field_tasks.h

…

field_weather.h

…

flags.h

Refactor testing flags and vars to not conflict with user ones (#6301)

2025-02-22 15:32:39 +01:00

followers.h

…

form_change_types.h

Expanded Pokémon Follower transformation functionality (#5048)

2025-01-18 23:19:06 +01:00

frontier_util.h

…

game_stat.h

…

generational_changes.h

Merge branch '_RHH/master' into _RHH/upcoming

2025-02-12 09:30:59 -03:00

global.h

Switch chance config support (#6187)

2025-02-10 00:30:54 +01:00

heal_locations.h

…

hold_effects.h

…

item_effects.h

…

item.h

…

items.h

…

lilycove_lady.h

…

map_scripts.h

…

map_types.h

Revert "Converts a bunch of defines to enums" (#6082)

2025-01-22 21:50:39 +01:00

maps.h

…

mauville_old_man.h

…

metatile_behaviors.h

…

metatile_labels.h

…

moves.h

…

mystery_gift.h

…

opponents.h

…

party_menu.h

Add caught mon to full party by sending a different mon to the Box (#6058)

2025-02-09 00:54:58 +01:00

pokedex.h

…

pokemon_icon.h

…

pokemon_sprite_visualizer.h

…

pokemon.h

Moved Pokémon Jump types to gSpeciesInfo (#5602)

2025-02-27 07:46:14 -08:00

region_map_sections.h

…

regions.h

Fixed non-regional forms breeding incorrectly (#4985)

2025-02-03 17:03:29 +01:00

rematches.h

…

rgb.h

…

roulette.h

…

script_menu.h

…

secret_bases.h

…

slot_machine.h

…

songs.h

Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan

2025-01-17 21:57:25 +01:00

sound.h

…

species.h

Rename Furfrou Species tags to match Pokemon Showdown exports (#6041)

2025-01-17 14:39:52 -03:00

tms_hms.h

…

trade.h

Revert "Converts a bunch of defines to enums" (#6082)

2025-01-22 21:50:39 +01:00

trainer_hill.h

…

trainer_slide.h

Removed Trainer Slides footgun (#6205)

2025-02-07 13:30:57 +01:00

trainer_types.h

…

trainers.h

Revert "Converts a bunch of defines to enums" (#6082)

2025-01-22 21:50:39 +01:00

tv.h

…

union_room.h

…

vars.h

Refactor testing flags and vars to not conflict with user ones (#6301)

2025-02-22 15:32:39 +01:00

weather.h

Debug menu and createmon additions/cleanup (#5994)

2025-01-11 10:07:47 +01:00

wild_encounter.h

…