Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-04-19 13:47:30 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
0eeba00d1b
pokeemerald/data
History
Hedara 0eeba00d1b Merge branch 'master' into master-upcoming-2025-04-30 
Conflicts:
	include/battle.h
	include/constants/expansion.h
	include/graphics.h
	src/battle_bg.c
	src/battle_util.c
	src/data/graphics/battle_terrain.h
	src/data/graphics/pokemon.h
	src/pokeblock_feed.c
	src/pokemon_sprite_visualizer.c
2025-04-30 15:22:37 +02:00
..
layouts REVERT ME TO RESTORE HOENN MAP ADJUSTMENTS 2024-12-21 11:00:27 -03:00
maps Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-02-20 19:17:59 -03:00
scripts Follower NPCs (follow-me) (#6500) 2025-04-27 14:56:18 +02:00
text Add caught mon to full party by sending a different mon to the Box (#6058) 2025-02-09 00:54:58 +01:00
tilesets REVERT ME TO RESTORE HOENN MAP ADJUSTMENTS 2024-12-21 11:00:27 -03:00
battle_anim_scripts.s Merge branch 'master' into master-upcoming-2025-04-30 2025-04-30 15:22:37 +02:00
battle_scripts_1.s Merge branch 'master' into master-upcoming-2025-04-30 2025-04-30 15:22:37 +02:00
battle_scripts_2.s Add caught mon to full party by sending a different mon to the Box (#6058) 2025-02-09 00:54:58 +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 Follower NPCs (follow-me) (#6500) 2025-04-27 14:56:18 +02:00
field_effect_scripts.s Add OW_DEFOG_FIELD_MOVE to allow players to clear overworld Fog (#6477) 2025-04-08 16:21:32 +02:00
map_events.s Updated existing OW pokemon events with new system. 2023-01-12 21:45:42 -05: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 Merge remote-tracking branch 'upstream/master' into followers 2025-02-10 00:11:38 -05:00
sound_data.s Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -03:00
specials.inc Add Code Entry functionality (#5951) 2025-01-25 22:03:08 +01:00