Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
pokeemmo/data
History
Eduardo Quezada 06153e4280 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	include/battle.h
#	include/constants/battle_script_commands.h
#	include/constants/pokemon.h
#	src/battle_ai_util.c
#	src/battle_main.c
#	src/battle_util.c
#	test/battle/ai.c
2024-06-13 11:44:28 -04:00
..
layouts
refactor: code review for expansion
2024-05-17 20:45:32 -04:00
maps
Merge branch '_RHH/master' into _RHH/upcoming
2024-06-11 08:12:03 -04:00
scripts
Add release to debug scripts (#4782)
2024-06-13 07:38:41 +02:00
text
Revert "Guillotine: Decapitalize everything (#3949)" (#4525)
2024-05-13 19:19:37 +02:00
tilesets
Metatile + commas
2024-05-30 13:56:14 -04:00
battle_anim_scripts.s
Merge branch '_RHH/master' into _RHH/upcoming
2024-06-13 11:44:28 -04:00
battle_scripts_1.s
Merge branch '_RHH/master' into _RHH/upcoming
2024-06-13 11:44:28 -04:00
battle_scripts_2.s
Fix dire hit being used on incorrect target (#4626)
2024-05-26 00:06:55 +02:00
contest_ai_scripts.s
Incorporated upstream fixes
2023-10-27 11:04:10 -03:00
event_scripts.s
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
2024-04-20 13:23:14 -04:00
field_effect_scripts.s
Whitespace, documentation and style
2024-01-22 19:12:52 -03: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
Remove unused callfunc
2024-06-02 10:53:45 -04:00
sound_data.s
Organized conffig files into their own folder and cleaned up
2022-11-14 11:03:49 -03:00
specials.inc
Pre-1.8 tweaks (#4275)
2024-03-12 12:21:03 +01:00