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 @@
SaffronCity_CopycatsHouse_1F_MapScripts:: @ 816EB36
SaffronCity_CopycatsHouse_1F_MapScripts::
.byte 0
SaffronCity_CopycatsHouse_1F_EventScript_CopycatsMom:: @ 816EB37
SaffronCity_CopycatsHouse_1F_EventScript_CopycatsMom::
msgbox SaffronCity_CopycatsHouse_1F_Text_DaughterIsSelfCentered, MSGBOX_NPC
end
SaffronCity_CopycatsHouse_1F_EventScript_CopycatsDad:: @ 816EB40
SaffronCity_CopycatsHouse_1F_EventScript_CopycatsDad::
msgbox SaffronCity_CopycatsHouse_1F_Text_DaughterLikesToMimicPeople, MSGBOX_NPC
end
SaffronCity_CopycatsHouse_1F_EventScript_Chansey:: @ 816EB49
SaffronCity_CopycatsHouse_1F_EventScript_Chansey::
lock
faceplayer
waitse
playmoncry SPECIES_CHANSEY, 0
playmoncry SPECIES_CHANSEY, CRY_MODE_NORMAL
msgbox SaffronCity_CopycatsHouse_1F_Text_Chansey
waitmoncry
release
@@ -1,13 +1,13 @@
SaffronCity_CopycatsHouse_1F_Text_DaughterIsSelfCentered:: @ 819AB9B
SaffronCity_CopycatsHouse_1F_Text_DaughterIsSelfCentered::
.string "My daughter is so self-centered.\n"
.string "She has but a few friends.$"
SaffronCity_CopycatsHouse_1F_Text_DaughterLikesToMimicPeople:: @ 819ABD7
SaffronCity_CopycatsHouse_1F_Text_DaughterLikesToMimicPeople::
.string "My daughter likes to mimic people.\n"
.string "It's rather vexing.\p"
.string "Her mimicry has earned her the\n"
.string "nickname COPYCAT around here.$"
SaffronCity_CopycatsHouse_1F_Text_Chansey:: @ 819AC4B
SaffronCity_CopycatsHouse_1F_Text_Chansey::
.string "CHANSEY: Chaan! Sii!$"