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

This commit is contained in:
GriffinR committed 2022-08-10 13:48:30 -04:00
commit 2b93687ade
1146 files changed
+40526 -38156

No files matched your search

+3 -3
View File
@@ -1,10 +1,10 @@
SSAnne_2F_Room6_MapScripts:: @ 8160D34
SSAnne_2F_Room6_MapScripts::
.byte 0
SSAnne_2F_Room6_EventScript_Woman1:: @ 8160D35
SSAnne_2F_Room6_EventScript_Woman1::
msgbox SSAnne_2F_Room6_Text_CaptainIsAwfullySick, MSGBOX_NPC
end
SSAnne_2F_Room6_EventScript_Woman2:: @ 8160D3E
SSAnne_2F_Room6_EventScript_Woman2::
msgbox SSAnne_2F_Room6_Text_ManyPeopleGetSeasick, MSGBOX_NPC
end
+2 -2
View File
@@ -1,7 +1,7 @@
SSAnne_2F_Room6_Text_CaptainIsAwfullySick:: @ 81740A1
SSAnne_2F_Room6_Text_CaptainIsAwfullySick::
.string "The CAPTAIN said he's awfully sick.\n"
.string "He was all pale.$"
SSAnne_2F_Room6_Text_ManyPeopleGetSeasick:: @ 81740D6
SSAnne_2F_Room6_Text_ManyPeopleGetSeasick::
.string "I hear many people get seasick.$"