dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
parent 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 changed files with 12564 additions and 12748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/Route2_EastBuilding/scripts.inc
+7 -10
View File
@@ -9,18 +9,15 @@ Route2_EastBuilding_EventScript_Aide::
call Route2_EastBuilding_EventScript_GetAideRequestInfo
goto_if_set FLAG_GOT_HM05, Route2_EastBuilding_EventScript_AlreadyGotHM05
msgbox Route2_EastBuilding_Text_GiveHM05IfSeen10Mons, 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 Route2_EastBuilding_EventScript_GetAideRequestInfo
compare VAR_0x8006, REQUIRED_SEEN_MONS
goto_if_lt Aide_EventScript_HaventCaughtEnough
goto_if_lt VAR_0x8006, REQUIRED_SEEN_MONS, Aide_EventScript_HaventCaughtEnough
msgbox Route2_EastBuilding_Text_GreatHereYouGo
checkitemspace ITEM_HM05, 1
compare VAR_RESULT, FALSE
goto_if_eq Aide_EventScript_NoRoomForItem
checkitemspace ITEM_HM05
goto_if_eq VAR_RESULT, FALSE, Aide_EventScript_NoRoomForItem
giveitem_msg Route2_EastBuilding_Text_ReceivedHM05FromAide, ITEM_HM05
setflag FLAG_GOT_HM05
msgbox Route2_EastBuilding_Text_ExplainHM05
@@ -33,8 +30,8 @@ Route2_EastBuilding_EventScript_AlreadyGotHM05::
end
Route2_EastBuilding_EventScript_GetAideRequestInfo::
getnumberstring 0, REQUIRED_SEEN_MONS
getitemname 1, ITEM_HM05
buffernumberstring STR_VAR_1, REQUIRED_SEEN_MONS
bufferitemname STR_VAR_2, ITEM_HM05
return
Route2_EastBuilding_EventScript_Rocker::