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/Route15_WestEntrance_2F/scripts.inc
+9 -12
View File
@@ -6,10 +6,10 @@ Route15_WestEntrance_2F_MapScripts::
Route15_WestEntrance_2F_EventScript_LeftBinoculars::
lockall
msgbox Route15_WestEntrance_2F_Text_LargeShiningBird
drawmonpic SPECIES_ARTICUNO, 10, 3
showmonpic SPECIES_ARTICUNO, 10, 3
delay 20
waitbuttonpress
erasemonpic
hidemonpic
setvar VAR_0x8004, SPECIES_ARTICUNO
special SetSeenMon
releaseall
@@ -25,18 +25,15 @@ Route15_WestEntrance_2F_EventScript_Aide::
call Route15_WestEntrance_2F_EventScript_GetAideRequestInfo
goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, Route15_WestEntrance_2F_EventScript_AlreadyGotExpShare
msgbox Route15_WestEntrance_2F_Text_GiveItemIfCaughtEnough, 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 Route15_WestEntrance_2F_EventScript_GetAideRequestInfo
compare VAR_0x8006, REQUIRED_CAUGHT_MONS
goto_if_lt Aide_EventScript_HaventCaughtEnough
goto_if_lt VAR_0x8006, REQUIRED_CAUGHT_MONS, Aide_EventScript_HaventCaughtEnough
msgbox Route15_WestEntrance_2F_Text_GreatHereYouGo
checkitemspace ITEM_EXP_SHARE, 1
compare VAR_RESULT, FALSE
goto_if_eq Aide_EventScript_NoRoomForItem
checkitemspace ITEM_EXP_SHARE
goto_if_eq VAR_RESULT, FALSE, Aide_EventScript_NoRoomForItem
giveitem_msg Route15_WestEntrance_2F_Text_ReceivedItemFromAide, ITEM_EXP_SHARE
setflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE
msgbox Route15_WestEntrance_2F_Text_ExplainExpShare
@@ -49,6 +46,6 @@ Route15_WestEntrance_2F_EventScript_AlreadyGotExpShare::
end
Route15_WestEntrance_2F_EventScript_GetAideRequestInfo::
getnumberstring 0, REQUIRED_CAUGHT_MONS
getitemname 1, ITEM_EXP_SHARE
buffernumberstring STR_VAR_1, REQUIRED_CAUGHT_MONS
bufferitemname STR_VAR_2, ITEM_EXP_SHARE
return