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

Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
parent 23d7c00c62 d6d5290099
commit 2b93687ade
1146 changed files with 40526 additions and 38156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeruleanCity_House3/scripts.inc
+6 -6
View File
@@ -1,11 +1,11 @@
CeruleanCity_House3_MapScripts:: @ 816A9A7
CeruleanCity_House3_MapScripts::
.byte 0
CeruleanCity_House3_EventScript_OldWoman:: @ 816A9A8
CeruleanCity_House3_EventScript_OldWoman::
msgbox CeruleanCity_House3_Text_PleaseTradeWithMyHusband, MSGBOX_NPC
end
CeruleanCity_House3_EventScript_Dontae:: @ 816A9B1
CeruleanCity_House3_EventScript_Dontae::
lock
faceplayer
setvar VAR_0x8008, INGAME_TRADE_JYNX
@@ -26,18 +26,18 @@ CeruleanCity_House3_EventScript_Dontae:: @ 816A9B1
release
end
CeruleanCity_House3_EventScript_DeclineTrade:: @ 816AA0B
CeruleanCity_House3_EventScript_DeclineTrade::
msgbox Trade_Text_WellIfYouDontWantTo
release
end
CeruleanCity_House3_EventScript_NotRequestedMon:: @ 816AA15
CeruleanCity_House3_EventScript_NotRequestedMon::
getspeciesname 0, VAR_0x8009
msgbox Trade_Text_ThisIsntMon
release
end
CeruleanCity_House3_EventScript_AlreadyTraded:: @ 816AA23
CeruleanCity_House3_EventScript_AlreadyTraded::
msgbox Trade_Text_HasTradedMonGrownStronger
release
end
data/maps/CeruleanCity_House3/text.inc
+1 -1
View File
@@ -1,4 +1,4 @@
CeruleanCity_House3_Text_PleaseTradeWithMyHusband:: @ 8191F80
CeruleanCity_House3_Text_PleaseTradeWithMyHusband::
.string "My husband likes trading POKéMON.\p"
.string "You're collecting POKéMON for your\n"
.string "POKéDEX, aren't you?\p"