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

This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
1146 changed files with 40526 additions and 38156 deletions
@@ -1,19 +1,19 @@
CeladonCity_DepartmentStore_4F_MapScripts:: @ 816BBEE
CeladonCity_DepartmentStore_4F_MapScripts::
.byte 0
CeladonCity_DepartmentStore_4F_EventScript_Man:: @ 816BBEF
CeladonCity_DepartmentStore_4F_EventScript_Man::
msgbox CeladonCity_DepartmentStore_4F_Text_GettingPokeDollAsPresent, MSGBOX_NPC
end
CeladonCity_DepartmentStore_4F_EventScript_Youngster:: @ 816BBF8
CeladonCity_DepartmentStore_4F_EventScript_Youngster::
msgbox CeladonCity_DepartmentStore_4F_Text_CanRunAwayWithPokeDoll, MSGBOX_NPC
end
CeladonCity_DepartmentStore_4F_EventScript_FloorSign:: @ 816BC01
CeladonCity_DepartmentStore_4F_EventScript_FloorSign::
msgbox CeladonCity_DepartmentStore_4F_Text_FloorSign, MSGBOX_SIGN
end
CeladonCity_DepartmentStore_4F_EventScript_Clerk:: @ 816BC0A
CeladonCity_DepartmentStore_4F_EventScript_Clerk::
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
@@ -25,7 +25,7 @@ CeladonCity_DepartmentStore_4F_EventScript_Clerk:: @ 816BC0A
end
.align 2
CeladonCity_DepartmentStore_4F_Items:: @ 816BC30
CeladonCity_DepartmentStore_4F_Items::
.2byte ITEM_POKE_DOLL
.2byte ITEM_RETRO_MAIL
.2byte ITEM_FIRE_STONE
@@ -1,17 +1,17 @@
CeladonCity_DepartmentStore_4F_Text_GettingPokeDollAsPresent:: @ 8195A68
CeladonCity_DepartmentStore_4F_Text_GettingPokeDollAsPresent::
.string "I'm getting a present for my\n"
.string "girlfriend.\p"
.string "I guess a POKé DOLL will be it.\n"
.string "It's the popular thing.$"
CeladonCity_DepartmentStore_4F_Text_CanRunAwayWithPokeDoll:: @ 8195AC9
CeladonCity_DepartmentStore_4F_Text_CanRunAwayWithPokeDoll::
.string "I heard something useful.\p"
.string "If a wild POKéMON appears, you can\n"
.string "distract it with a POKé DOLL.\p"
.string "You can run away while the wild\n"
.string "POKéMON is distracted.$"
CeladonCity_DepartmentStore_4F_Text_FloorSign:: @ 8195B5B
CeladonCity_DepartmentStore_4F_Text_FloorSign::
.string "Express yourself with gifts!\n"
.string "4F: WISE MAN GIFTS\p"
.string "Evolution Special!\n"