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

fix merge conflicts

Browse Source
This commit is contained in:
Evan
2019-11-26 13:55:24 -07:00
parent d1142b4290 19ecb1631b
commit 31d8bfb048
222 changed files with 17265 additions and 27793 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sea_cottage.h
+1 -1
View File
@@ -9,4 +9,4 @@ bool8 sub_809C474(void);
void sub_809C4A8(void);
void sub_809C5FC(void);
#endif // GUARD_SHOP_H
#endif // GUARD_SEA_COTTAGE_H