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

Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures

Browse Source 
# Conflicts:
#	src/pokemon.c
This commit is contained in:
Eduardo Quezada
2022-10-30 12:16:09 -03:00
parent b2b308fe9e 93dd8786ee
commit 3172273c73
429 changed files with 13567 additions and 20206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts/new_game.inc
View File

@@ -38,7 +38,7 @@ EventScript_ResetAllBerries::
setberrytree BERRY_TREE_ROUTE_117_WEPEAR_3, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree BERRY_TREE_ROUTE_117_WEPEAR_2, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
setberrytree BERRY_TREE_ROUTE_117_WEPEAR_1, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
@ Route 112
setberrytree BERRY_TREE_ROUTE_112_RAWST_2, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
setberrytree BERRY_TREE_ROUTE_112_PECHA_2, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES

2
data/scripts/roulette.inc
View File

@@ -22,7 +22,7 @@ Roulette_EventScript_Play::
special PlayRoulette
waitstate
end
Roulette_Text_PlayMinimumWagerIsX::
.string "The minimum wager at this table\n"
.string "is {STR_VAR_1}. Do you want to play?$"