Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-08-22 01:56:00 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '_RHH/master' into _RHH/upcoming

Browse Source 
# Conflicts:
#	src/battle_controller_player_partner.c
This commit is contained in:
Eduardo Quezada
2024-01-28 18:11:44 -03:00
parent 308bf50dcc 9bcd46bce8
commit afb1efe0d3
12 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/scripts/contest_hall.inc
View File

@@ -31,6 +31,7 @@ LilycoveCity_ContestLobby_EventScript_ReceptionWelcome::
LilycoveCity_ContestLobby_EventScript_GivePokeblockCase::
msgbox LilycoveCity_ContestLobby_Text_ReceptionDontHavePokeblockCase, MSGBOX_DEFAULT
giveitem ITEM_POKEBLOCK_CASE
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_POKEBLOCK_CASE
msgbox LilycoveCity_ContestLobby_Text_NowThatWeveClearedThatUp, MSGBOX_DEFAULT
return