dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

fix record mixing merge conflicts

Browse Source
This commit is contained in:
DizzyEggg committed 2018-05-19 12:32:44 +02:00
2 parents 0c1f85f200 db898d0e48
commit e44f35c7b7
26 files changed
+1631 -2452
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/fldeff_80F9BCC.h
+2
View File
@@ -9,6 +9,8 @@
void sub_80FA5E4(s16 id, s16 x, s16 y);
void sub_80FA794(s16 x, s16 y);
void sub_80FB00C(void);
void sub_80FB074(void);
void overworld_poison_effect(void);
bool8 sub_80FADE4(u16, u8);