Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
pokeemmo/src/data
History
Hedara 4873589c65 Merge remote-tracking branch 'pret/master' into new-pret-merge 
Conflicts:
	asm/macros/battle_script.inc
	data/battle_anim_scripts.s
	include/battle.h
	include/battle_controllers.h
	include/battle_setup.h
	include/constants/battle.h
	src/battle_anim_normal.c
	src/battle_anim_utility_funcs.c
	src/battle_bg.c
	src/battle_controllers.c
	src/battle_main.c
	src/battle_script_commands.c
2025-04-29 20:27:33 +02:00
..
bard_music
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan
2025-01-17 21:57:25 +01:00
battle_frontier
Merge remote-tracking branch 'pret/master' into pret-merge-2025-03-29
2025-03-29 14:21:29 +01:00
decoration
Clean up defines lacking spaces
2024-08-15 19:34:56 +02:00
easy_chat
Merge remote-tracking branch 'pret/master' into pret-merge-2025-02-11
2025-02-11 11:20:37 +01:00
field_effects
merge w upcoming
2024-10-04 12:56:21 -04:00
graphics
Merge remote-tracking branch 'pret/master' into new-pret-merge
2025-04-29 20:27:33 +02:00
object_events
Replace Incorrect Slow Stairs Movement with Correct One (#6275)
2025-03-16 14:51:36 -07:00
pokemon
Merge remote-tracking branch 'pret/master' into new-pret-merge
2025-04-29 20:27:33 +02:00
region_map
Update gitignore/spacing for new region map data
2022-10-30 12:22:41 -04:00
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
Update gitignore/spacing for new region map data
2022-10-30 12:22:41 -04:00
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
Fixes crash damage move against absorbing abilities (#6361)
2025-03-09 20:54:58 +01:00
battle_partners.h
Make generated files match the current formatting (#6636)
2025-04-17 13:38:30 +02: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
Gimmick Indicator refactor (#6553)
2025-04-10 23:56:26 +02: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
Add hold effects for PLA Origin Trio items (#6578)
2025-04-11 16:38:08 +02: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 'master' into final-1.10-master-upcoming-merge
2025-02-26 22:07:10 +01:00
partner_parties.h
Make trainerproc compatible with partners (#4421)
2024-04-22 17:03:36 +02:00
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
pointillism_points.h
Solved a bunch of -Wall errors on modern
2023-09-20 19:01:08 -03:00
pokedex_area_glow.h
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
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
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-12 09:30:59 -03:00
trainers.party
Fixed a missing ) in trainers.party comment block. (#6367)
2025-03-02 15:00:57 +01:00
types_info.h
Easy customizable Hidden Move types (#5872)
2025-01-04 21:42:14 +01:00
union_room.h
Hide in-battle types from Union Room trade request (#6489)
2025-03-30 10:57:58 +02: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