ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-26 06:05:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
pokeemerald/data
History
Eduardo Quezada 7c86bd5d08 Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826 
# Conflicts:
#	include/battle_interface.h
#	src/battle_anim_effects_1.c
#	src/battle_script_commands.c
#	src/field_specials.c
2022-08-26 22:23:37 -04:00
..
layouts
Label unused layouts
2021-02-08 14:45:56 -05:00
maps
Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826
2022-08-26 22:23:37 -04:00
scripts
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
2022-08-22 20:30:45 -04:00
text
Fixed instances of .string being used with spaces instead of tabs
2022-08-15 14:32:01 -04:00
tilesets
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
battle_anim_scripts.s
Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826
2022-08-26 22:23:37 -04:00
battle_scripts_1.s
Merge pull request #2173 from LOuroboros/yourAffection
2022-08-26 14:54:32 -04:00
battle_scripts_2.s
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 23:51:29 -08:00
contest_ai_scripts.s
Removed trailing spaces in the most relevant files
2021-08-24 19:59:32 -03:00
event_scripts.s
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
field_effect_scripts.s
Continue battle_transition documenting
2021-10-29 11:24:36 -04:00
map_events.s
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03: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 branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
sound_data.s
Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms
2022-08-22 17:27:21 -04:00
specials.inc
Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge
2022-07-22 23:33:04 -04:00
tilesets.s
Organize map data
2017-11-10 12:39:00 -06:00