ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-26 22:25:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
pokeemerald/data
History
Eduardo Quezada D'Ottone e791cf90ad Merge tag 'pretmaster' into BE_pretmerge2 
# Conflicts:
#	data/battle_anim_scripts.s
#	include/battle_anim.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/battle_main.h
#	include/battle_setup.h
#	include/constants/battle_anim.h
#	include/constants/battle_string_ids.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_fire.c
#	src/battle_anim_normal.c
#	src/battle_controllers.c
#	src/battle_dome.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/pokemon.c
2022-07-15 12:58:46 -04:00
..
layouts
Label unused layouts
2021-02-08 14:45:56 -05:00
maps
Supplant https://github.com/pret/pokeemerald/pull/1579
2022-06-18 21:51:05 -03:00
scripts
Fix inconsistent static s/g names
2022-05-17 14:00:02 -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_anim_scripts.s
Merge tag 'pretmaster' into BE_pretmerge2
2022-07-15 12:58:46 -04:00
battle_scripts_1.s
Merge pull request #1992 from AsparagusEduardo/BE_WhiteOutMoney
2022-07-01 11:58:36 -04:00
battle_scripts_2.s
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-11 16:33:10 -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
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2022-02-28 22:13:14 -08: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
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
tilesets.s
Organize map data
2017-11-10 12:39:00 -06:00