ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-06 15:38:11 +01:00
Code Issues Packages Projects Releases Wiki Activity
pokeemerald/data
History
Eduardo Quezada 749225ace1 Matching merge from upstream pret 
# Conflicts:
#	graphics/interface/menu_info.png
#	include/pokemon.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_mons.c
#	src/battle_anim_water.c
#	src/battle_controller_opponent.c
#	src/battle_gfx_sfx_util.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
2023-01-20 12:31:54 -03:00
..
layouts
Label unused layouts
2021-02-08 14:45:56 -05:00
maps
Matching merge from upstream pret
2023-01-20 12:31:54 -03:00
scripts
Fixed reusable repels/lures function forcefully using items while menu config is on
2023-01-04 00:00:13 -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
Matching merge from upstream pret
2023-01-20 12:31:54 -03:00
battle_scripts_1.s
Updated the implementation
2023-01-09 15:18:22 -03:00
battle_scripts_2.s
Organized conffig files into their own folder and cleaned up
2022-11-14 11:03:49 -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
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -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
Matching merge from upstream pret
2023-01-20 12:31:54 -03:00