pokeemerald/data
Eduardo Quezada D'Ottone f78bb4fb84 Merge remote-tracking branch 'pret/master' into item_expansion
# Conflicts:
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
2022-07-12 17:42:32 -04:00
..
layouts Label unused layouts 2021-02-08 14:45:56 -05:00
maps Merge remote-tracking branch 'pret/master' into item_expansion 2022-07-12 17:42:32 -04:00
scripts Merge remote-tracking branch 'pret/master' into item_expansion 2022-07-12 17:42:32 -04:00
text Merge pull request #1687 from SimplyBLGDev/patch-1 2022-06-18 11:04:39 -04:00
tilesets Fix incorrect ever grande flower animation palettes 2021-12-06 11:17:42 -05:00
battle_ai_scripts.s Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-11-21 10:41:32 -08:00
battle_anim_scripts.s Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
battle_scripts_1.s Standarized Solarbeam into Solar Beam 2021-11-01 18:36:35 -03:00
battle_scripts_2.s Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp 2021-08-30 11:57:27 -07:00
contest_ai_scripts.s Removed trailing spaces in the most relevant files 2021-08-24 19:59:32 -03:00
event_scripts.s Update event_scripts.s 2021-12-21 22:10:54 -03:00
field_effect_scripts.s Continue battle_transition documenting 2021-10-29 11:24:36 -04:00
map_events.s Add missing :req, remove old macros 2022-01-23 18:52:04 -05:00
maps.s Add missing :req, remove old macros 2022-01-23 18:52:04 -05:00
mb_berry_fix.gba Remove berry fix 2022-01-13 15:26:20 -05:00
mb_colosseum.gba Remove berry fix 2022-01-13 15:26:20 -05:00
mb_ereader.gba Remove berry fix 2022-01-13 15:26:20 -05:00
multiboot_berry_glitch_fix.s Remove berry fix 2022-01-13 15:26:20 -05:00
multiboot_ereader.s Remove berry fix 2022-01-13 15:26:20 -05:00
multiboot_pokemon_colosseum.s Remove berry fix 2022-01-13 15:26:20 -05:00
mystery_event_script_cmd_table.s Remove address comments 2021-07-20 15:18:31 -04:00
mystery_gift.s Clean up pokedex_area_screen 2021-12-31 00:16:56 -05:00
script_cmd_table.inc Misc cleanup 2022-01-04 10:09:42 -05:00
sound_data.s Extract voicegroups 2018-01-09 19:27:11 -06:00
specials.inc Clean up braille_puzzles 2021-10-30 11:59:14 -04:00
tilesets.s Organize map data 2017-11-10 12:39:00 -06:00