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/Route18_EastEntrance_2F/scripts.inc
+4 -7
View File
@@ -16,14 +16,11 @@ Route18_EastEntrance_2F_EventScript_Haden::
call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_MARC_TRADE, Route18_EastEntrance_2F_EventScript_AlreadyTraded
msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq Route18_EastEntrance_2F_EventScript_DeclineTrade
goto_if_eq VAR_RESULT, NO, Route18_EastEntrance_2F_EventScript_DeclineTrade
call EventScript_ChooseMonForInGameTrade
compare VAR_0x8004, PARTY_SIZE
goto_if_ge Route18_EastEntrance_2F_EventScript_DeclineTrade
goto_if_ge VAR_0x8004, PARTY_SIZE, Route18_EastEntrance_2F_EventScript_DeclineTrade
call EventScript_GetInGameTradeSpecies
compare VAR_RESULT, VAR_0x8009
goto_if_ne Route18_EastEntrance_2F_EventScript_NotRequestedMon
goto_if_ne VAR_RESULT, VAR_0x8009, Route18_EastEntrance_2F_EventScript_NotRequestedMon
call EventScript_DoInGameTrade
msgbox Trade_Text_HeyThanks
setflag FLAG_DID_MARC_TRADE
@@ -36,7 +33,7 @@ Route18_EastEntrance_2F_EventScript_DeclineTrade::
end
Route18_EastEntrance_2F_EventScript_NotRequestedMon::
getspeciesname 0, VAR_0x8009
bufferspeciesname STR_VAR_1, VAR_0x8009
msgbox Trade_Text_WhatThatsNoMon
release
end