Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
e758d55a03
pokeemerald-expansion/data
History
Hedara e758d55a03 Merge remote-tracking branch 'pret/master' into pret-merge 
Manual cleanups to the Magma Storm animation and AnimTask_InvertScreenColor

 Conflicts:
	asm/macros/battle_anim_script.inc
	data/battle_anim_scripts.s
	include/constants/battle_anim.h
	src/battle_anim_bug.c
	src/battle_anim_dragon.c
	src/battle_anim_effects_1.c
	src/battle_anim_normal.c
2026-01-31 19:20:54 +01:00
..
layouts REVERT ME TO RESTORE HOENN MAP ADJUSTMENTS 2024-12-21 11:00:27 -03:00
maps 19/11/25 Master to upcoming merge 2025-11-19 18:20:30 +01:00
scripts 19/11/25 Master to upcoming merge 2025-11-19 18:20:30 +01:00
text Added contest config and cleaned up contest category variables (#8178) 2025-11-13 11:29:38 +01:00
tilesets REVERT ME TO RESTORE HOENN MAP ADJUSTMENTS 2024-12-21 11:00:27 -03:00
battle_anim_scripts.s Merge remote-tracking branch 'pret/master' into pret-merge 2026-01-31 19:20:54 +01:00
battle_scripts_1.s Add accuracy check to BattleScript_EffectNightmare (#9032) 2026-01-27 16:17:25 +01:00
battle_scripts_2.s 27/11/25 Master to upcoming merge 2025-11-27 13:39:12 +01:00
contest_ai_scripts.s Move general config file to the config folder (#4805) 2024-06-19 13:42:01 +02:00
event_scripts.s Align gSpecialVars 2025-12-14 23:03:33 -05:00
field_effect_scripts.s Misc style and whitespace cleanup (#8681) 2026-01-02 18:01:43 +01:00
map_events.s Implement GSC berry/apricorn tree functionality. (#7777) 2025-11-14 20:28:55 +01:00
maps.s Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
mb_berry_fix.gba Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
mb_colosseum.gba Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
mb_ereader.gba Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
multiboot_berry_glitch_fix.s Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
multiboot_ereader.s Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
multiboot_pokemon_colosseum.s Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
mystery_event_script_cmd_table.s Remove address comments 2021-07-20 15:18:31 -04:00
mystery_gift.s Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
script_cmd_table.inc Bugfix hidefollower not waiting properly (#7768) 2025-10-19 16:39:07 +02:00
sound_data.s Make TRUE and 1 behave the same in config/species_enabled.h (#8421) 2025-12-04 15:27:50 +01:00
specials.inc Implement GSC berry/apricorn tree functionality. (#7777) 2025-11-14 20:28:55 +01:00