hedara90 cad1a37566

Tachyon Cutter and Salt Cure animations (#6182) ...

Co-authored-by: Hedara <hedara90@gmail.com>

2025-02-05 15:27:21 +01:00

..

bard_music

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

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

battle_frontier

Adds battle frontier conversion script (#5040)

2024-07-31 15:04:21 -07:00

decoration

Clean up defines lacking spaces

2024-08-15 19:34:56 +02:00

easy_chat

Matching merge from upstream pret

2023-01-20 12:31:54 -03:00

field_effects

merge w upcoming

2024-10-04 12:56:21 -04:00

graphics

Add Mega Evo, Primal Reversion, and Ultra Necrozma OW sprites (#5874)

2025-01-30 22:29:20 -03:00

object_events

Moved mon pic tables to gSpeciesInfo + macro cleanup (#5597)

2025-01-20 07:52:29 -08:00

pokemon

Merge branch '_RHH/master' into _RHH/upcoming

2025-02-02 14:18:13 -03:00

region_map

…

text

Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into pretmerge7aug

2024-08-07 12:42:45 +02:00

tilesets

Replaced all usages of tabs in C files with spaces (#5261)

2024-08-26 16:55:54 -07:00

.gitignore

…

abilities.h

Merge branch '_RHH/master' into _RHH/upcoming

2024-10-12 16:23:27 -03:00

battle_anim.h

Tachyon Cutter and Salt Cure animations (#6182)

2025-02-05 15:27:21 +01:00

battle_move_effects.h

Merge branch '_RHH/master' into _RHH/upcoming

2025-02-02 14:18:13 -03:00

battle_partners.h

Adds B_VAR_DIFFICULTY and related functions READ DESC (#5337)

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

battle_partners.party

Make trainerproc compatible with partners (#4421)

2024-04-22 17:03:36 +02:00

battle_pool_rules.h

Trainer Party Pools (#5731)

2025-01-25 13:28:46 +01:00

contest_moves.h

Move data unification (#3999)

2024-01-29 08:51:32 -03:00

contest_opponents.h

Consolidated contest opponent filters into gContestOpponents (#6119)

2025-01-26 23:12:49 +01:00

contest_text_tables.h

Clean up contest strings (#3876)

2024-02-02 10:55:39 +01:00

credits.h

Solved a bunch of -Wall errors on modern

2023-09-20 19:01:08 -03:00

gimmicks.h

Remove trailing whitespace (master) (#5174)

2024-08-14 19:48:20 -07:00

heal_locations_pkm_center.h

Remove trailing whitespace pass 10-2-2024 (Upcoming) (#5456)

2024-10-02 21:20:23 +02:00

heal_locations.h

…

item_icon_table.h

Test runner set mode (#4661)

2024-05-30 21:24:33 +02:00

items.h

Decouple Poke Ball ids from item ids (#5560)

2024-10-28 18:03:15 +01:00

lilycove_lady.h

Consolidated Lilycove Contest Lady's values into one struct (#4951)

2024-07-13 14:44:22 +02:00

moves_info.h

Merge branch '_RHH/master' into _RHH/upcoming

2025-01-26 22:57:11 -03:00

partner_parties.h

Make trainerproc compatible with partners (#4421)

2024-04-22 17:03:36 +02:00

party_menu.h

Allow Party Menu with 0 Pokemon (#5997)

2025-01-11 12:14:31 +01:00

pointillism_points.h

Solved a bunch of -Wall errors on modern

2023-09-20 19:01:08 -03:00

pokedex_area_glow.h

…

script_menu.h

Converts multi-choice options to COMPOUND_STRINGs (#5686)

2024-12-03 12:32:13 +01:00

trade.h

Solved a bunch of -Wall errors on modern

2023-09-20 19:01:08 -03:00

trainer_parties.h

Competitive-formatted parties (#3545)

2024-04-06 15:05:15 -03:00

trainers.h

Re-removed trainers.h trailing whitespace (#6048)

2025-01-19 11:33:39 +01:00

trainers.party

AI_FLAG_SETUP_FIRST_TURN Rename and Clarifications (#5310)

2024-09-04 11:12:55 +02:00

types_info.h

Easy customizable Hidden Move types (#5872)

2025-01-04 21:42:14 +01:00

union_room.h

Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909

2024-09-11 15:26:14 -03:00

wallpapers.h

Added Japan-only Walda PC icons (#3550)

2023-11-18 00:54:13 +01:00

wild_encounters.json

Final cleanup

2024-05-16 18:08:10 -04:00

wild_encounters.json.txt

Revert rtc based encounters (#5331)

2024-09-06 21:09:04 +02:00