dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix PR merge conflicts

Browse Source
This commit is contained in:
Evan
2019-11-21 09:31:40 -07:00
parent e6bc189a03 1234d0252c
commit 407d22af8e
47 changed files with 1979 additions and 4704 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/strings.s
+1 -1
View File
@@ -4517,7 +4517,7 @@ gUnknown_841E2F5:: @ 841E2F5
gUnknown_841E322:: @ 841E322
.string "{ID}$"
gUnknown_841E325:: @ 841E325
gText_CommunicationStandby5:: @ 841E325
.string "Communication standby…$"
gDaycareText_GetAlongVeryWell:: @ 841E33C