Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Matching merge from upstream pret

Browse Source 
# 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
This commit is contained in:
Eduardo Quezada committed 2023-01-20 12:31:54 -03:00
2 parents c72274ee98 0851e55ccb
commit 749225ace1
263 files changed
+5465 -8083
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/specials.inc
+1 -1
View File
@@ -430,7 +430,7 @@ gSpecials::
def_special ShowWirelessCommunicationScreen
def_special InitUnionRoom
def_special BufferUnionRoomPlayerName
def_special RetrieveWonderNewsVal
def_special WonderNews_GetRewardInfo
def_special ChooseMonForWirelessMinigame
def_special Script_ResetUnionRoomTrade
def_special IsBadEggInParty