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/CeladonCity_DepartmentStore_2F/scripts.inc
+8 -8
View File
@@ -1,19 +1,19 @@
CeladonCity_DepartmentStore_2F_MapScripts:: @ 816BAF4
CeladonCity_DepartmentStore_2F_MapScripts::
.byte 0
CeladonCity_DepartmentStore_2F_EventScript_UnusedNPC:: @ 816BAF5
CeladonCity_DepartmentStore_2F_EventScript_UnusedNPC::
msgbox CeladonCity_DepartmentStore_2F_Text_SuperRepelMorePowerfulRepel, MSGBOX_NPC
end
CeladonCity_DepartmentStore_2F_EventScript_Lass:: @ 816BAFE
CeladonCity_DepartmentStore_2F_EventScript_Lass::
msgbox CeladonCity_DepartmentStore_2F_Text_BuyReviveForLongOutings, MSGBOX_NPC
end
CeladonCity_DepartmentStore_2F_EventScript_FloorSign:: @ 816BB07
CeladonCity_DepartmentStore_2F_EventScript_FloorSign::
msgbox CeladonCity_DepartmentStore_2F_Text_FloorSign, MSGBOX_SIGN
end
CeladonCity_DepartmentStore_2F_EventScript_ClerkItems:: @ 816BB10
CeladonCity_DepartmentStore_2F_EventScript_ClerkItems::
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
@@ -25,7 +25,7 @@ CeladonCity_DepartmentStore_2F_EventScript_ClerkItems:: @ 816BB10
end
.align 2
CeladonCity_DepartmentStore_2F_Items:: @ 816BB38
CeladonCity_DepartmentStore_2F_Items::
.2byte ITEM_GREAT_BALL
.2byte ITEM_SUPER_POTION
.2byte ITEM_REVIVE
@@ -39,7 +39,7 @@ CeladonCity_DepartmentStore_2F_Items:: @ 816BB38
release
end
CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs:: @ 816BB4E
CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs::
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
@@ -51,7 +51,7 @@ CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs:: @ 816BB4E
end
.align 2
CeladonCity_DepartmentStore_2F_TMs:: @ 816BB74
CeladonCity_DepartmentStore_2F_TMs::
.2byte ITEM_TM05
.2byte ITEM_TM15
.2byte ITEM_TM28
data/maps/CeladonCity_DepartmentStore_2F/text.inc
+4 -4
View File
@@ -1,17 +1,17 @@
CeladonCity_DepartmentStore_2F_Text_SuperRepelMorePowerfulRepel:: @ 81955C7
CeladonCity_DepartmentStore_2F_Text_SuperRepelMorePowerfulRepel::
.string "SUPER REPEL keeps weak POKéMON at\n"
.string "bay…\p"
.string "Hmm, it's a more powerful REPEL.$"
CeladonCity_DepartmentStore_2F_Text_BuyReviveForLongOutings:: @ 819560F
CeladonCity_DepartmentStore_2F_Text_BuyReviveForLongOutings::
.string "For long outings, you should buy\n"
.string "REVIVE.$"
CeladonCity_DepartmentStore_2F_Text_FloorSign:: @ 8195638
CeladonCity_DepartmentStore_2F_Text_FloorSign::
.string "Top-Grade Items for TRAINERS!\p"
.string "2F: TRAINER'S MARKET$"
CeladonCity_DepartmentStore_2F_Text_LanceComesToBuyCapes:: @ 819566B
CeladonCity_DepartmentStore_2F_Text_LanceComesToBuyCapes::
.string "We have a customer, LANCE, who\n"
.string "occasionally comes.\p"
.string "He always buys capes.\p"