diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
| commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
| tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /include/rom6.h | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'include/rom6.h')
| -rw-r--r-- | include/rom6.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/rom6.h b/include/rom6.h index e7a3ba48e..8c3691624 100644 --- a/include/rom6.h +++ b/include/rom6.h @@ -1,6 +1,8 @@ #ifndef GUARD_ROM6_H #define GUARD_ROM6_H +extern struct MapPosition gUnknown_0203923C; + bool8 npc_before_player_of_type(u8); u8 oei_task_add(void); |