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
+3 -3
View File
@@ -1,10 +1,10 @@
SSAnne_2F_Room5_MapScripts:: @ 8160D21
SSAnne_2F_Room5_MapScripts::
.byte 0
SSAnne_2F_Room5_EventScript_Gentleman:: @ 8160D22
SSAnne_2F_Room5_EventScript_Gentleman::
msgbox SSAnne_2F_Room5_Text_HaveYouGoneToSafariZone, MSGBOX_NPC
end
SSAnne_2F_Room5_EventScript_LittleBoy:: @ 8160D2B
SSAnne_2F_Room5_EventScript_LittleBoy::
msgbox SSAnne_2F_Room5_Text_WeThinkSafariZoneIsAwesome, MSGBOX_NPC
end
+2 -2
View File
@@ -1,10 +1,10 @@
SSAnne_2F_Room5_Text_HaveYouGoneToSafariZone:: @ 8173FF7
SSAnne_2F_Room5_Text_HaveYouGoneToSafariZone::
.string "Have you gone to the SAFARI ZONE\n"
.string "in FUCHSIA CITY?\p"
.string "There are many kinds of rare\n"
.string "POKéMON.$"
SSAnne_2F_Room5_Text_WeThinkSafariZoneIsAwesome:: @ 817404F
SSAnne_2F_Room5_Text_WeThinkSafariZoneIsAwesome::
.string "Me and my daddy think the SAFARI\n"
.string "ZONE is awesome!\l"
.string "I wish we could go there again.$"