ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
9917f5cc8b
pokeemerald/data
History
Eduardo Quezada 9917f5cc8b Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 
# Conflicts:
#	Makefile
#	include/constants/pokemon.h
#	include/pokemon.h
#	make_tools.mk
#	src/battle_ai_script_commands.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/party_menu.c
#	src/pokemon.c
#	src/trade.c
#	src/trainer_pokemon_sprites.c
2023-03-03 11:00:50 -03:00
..
layouts Label unused layouts 2021-02-08 14:45:56 -05:00
maps Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 2023-03-03 11:00:50 -03:00
scripts Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 2023-03-03 11:00:50 -03:00
text Fixed instances of .string being used with spaces instead of tabs 2022-08-15 14:32:01 -04:00
tilesets Convert tilesets.s to C 2022-09-27 17:23:26 -04:00
battle_anim_scripts.s Removed trailing whitespaces 2023-02-26 18:43:15 -03:00
battle_scripts_1.s Fix wrong Contrary message when affected by Intimidate (#2723) 2023-03-02 09:38:00 -05:00
battle_scripts_2.s Fix bugs related to Trainer Slide messages (#2699) 2023-02-27 09:11:25 +01:00
contest_ai_scripts.s Incorporate commented bug fixes in contest AI scripts 2022-08-19 19:45:15 -04:00
event_scripts.s Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -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 Review changes 2023-02-15 13:56:11 -03:00
sound_data.s Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -03:00
specials.inc Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 2023-03-03 11:00:50 -03:00