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

Merge branch 'master' into doc-cinnabar

Browse Source
This commit is contained in:
GriffinR
2020-01-22 11:38:44 -05:00
committed by GitHub
parent 84c198ac76 c75296640d
commit fbf0c4616c
53 changed files with 871 additions and 810 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/UndergroundPath_NorthEntrance/map.json
+1 -1
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "UndergroundPath_NorthEntrance_EventScript_160E39",
"script": "UndergroundPath_NorthEntrance_EventScript_Saige",
"flag": "0"
}
],
data/maps/UndergroundPath_NorthEntrance/scripts.inc
+8 -8
View File
@@ -1,39 +1,39 @@
UndergroundPath_NorthEntrance_MapScripts:: @ 8160E38
.byte 0
UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39
UndergroundPath_NorthEntrance_EventScript_Saige:: @ 8160E39
lock
faceplayer
setvar VAR_0x8008, INGAME_TRADE_NIDORAN
call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_MS_NIDO_TRADE, EventScript_160EAB
goto_if_set FLAG_DID_MS_NIDO_TRADE, UndergroundPath_NorthEntrance_EventScript_AlreadyTraded
msgbox Trade_Text_DoYouHaveMonWantToTradeForMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_160E93
goto_if_eq UndergroundPath_NorthEntrance_EventScript_DeclineTrade
call EventScript_ChooseMonForInGameTrade
compare VAR_0x8004, PARTY_SIZE
goto_if_ge EventScript_160E93
goto_if_ge UndergroundPath_NorthEntrance_EventScript_DeclineTrade
call EventScript_GetInGameTradeSpecies
compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_160E9D
goto_if_ne UndergroundPath_NorthEntrance_EventScript_NotRequestedMon
call EventScript_DoInGameTrade
msgbox Trade_Text_ThanksYoureAPal
setflag FLAG_DID_MS_NIDO_TRADE
release
end
EventScript_160E93:: @ 8160E93
UndergroundPath_NorthEntrance_EventScript_DeclineTrade:: @ 8160E93
msgbox Trade_Text_ThatsTooBad
release
end
EventScript_160E9D:: @ 8160E9D
UndergroundPath_NorthEntrance_EventScript_NotRequestedMon:: @ 8160E9D
getspeciesname 0, VAR_0x8009
msgbox Trade_Text_ThisIsNoMon
release
end
EventScript_160EAB:: @ 8160EAB
UndergroundPath_NorthEntrance_EventScript_AlreadyTraded:: @ 8160EAB
msgbox Trade_Text_HowIsMyOldMon
release
end