ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-09-29 01:04:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
170ff2f422
pokeemerald/data
History
Eduardo Quezada 51b716c9d9 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319 
# Conflicts:
#	data/battle_scripts_2.s
#	include/constants/battle_string_ids.h
#	include/constants/songs.h
#	src/battle_message.c
#	src/data/pokemon/species_info.h
2023-03-19 20:28:56 -03:00
..
layouts Label unused layouts 2021-02-08 14:45:56 -05:00
maps Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319 2023-03-19 20:28:56 -03:00
scripts Updated the debug menu 2023-03-08 15:27:22 -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 Added Psyblade and Hydro Steam 2023-03-17 09:25:39 -03:00
battle_scripts_1.s Added Psyblade and Hydro Steam 2023-03-17 09:25:39 -03:00
battle_scripts_2.s Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319 2023-03-19 20:28:56 -03: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