Merge branch 'master' into clone-union

This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
322 changed files with 12564 additions and 12748 deletions
+7 -10
View File
@@ -35,18 +35,15 @@ Route10_PokemonCenter_1F_EventScript_Aide::
call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo
goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, Route10_PokemonCenter_1F_EventScript_AlreadyGotEverstone
msgbox Route10_PokemonCenter_1F_Text_GiveEverstoneIfCaught20Mons, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq Aide_EventScript_DeclineCheckMons
goto_if_eq VAR_RESULT, NO, Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, GetPokedexCount
getnumberstring 2, VAR_0x8006
buffernumberstring STR_VAR_3, VAR_0x8006
call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo
compare VAR_0x8006, REQUIRED_OWNED_MONS
goto_if_lt Aide_EventScript_HaventCaughtEnough
goto_if_lt VAR_0x8006, REQUIRED_OWNED_MONS, Aide_EventScript_HaventCaughtEnough
msgbox Route10_PokemonCenter_1F_Text_GreatHereYouGo
checkitemspace ITEM_EVERSTONE, 1
compare VAR_RESULT, FALSE
goto_if_eq Aide_EventScript_NoRoomForItem
checkitemspace ITEM_EVERSTONE
goto_if_eq VAR_RESULT, FALSE, Aide_EventScript_NoRoomForItem
giveitem_msg Route10_PokemonCenter_1F_Text_ReceivedEverstoneFromAide, ITEM_EVERSTONE
setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE
msgbox Route10_PokemonCenter_1F_Text_ExplainEverstone
@@ -59,6 +56,6 @@ Route10_PokemonCenter_1F_EventScript_AlreadyGotEverstone::
end
Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo::
getnumberstring 0, REQUIRED_OWNED_MONS
getitemname 1, ITEM_EVERSTONE
buffernumberstring STR_VAR_1, REQUIRED_OWNED_MONS
bufferitemname STR_VAR_2, ITEM_EVERSTONE
return