diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-08-30 16:23:19 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-08-30 16:23:19 -0400 |
| commit | 1ca1651cdcdfc2ca2f8c9214c88fd23b5196f85e (patch) | |
| tree | a6c9f2edfb0f5c380cc35175024d18bd77ea243a /include/rom4.h | |
| parent | 7c32f9d05f06303f5350eb079960e0d4fab40dcd (diff) | |
| parent | d7a6ff0e4dab0c96ac49975a0695014bff2b9654 (diff) | |
attempting to resolve conflict
Diffstat (limited to 'include/rom4.h')
| -rw-r--r-- | include/rom4.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rom4.h b/include/rom4.h index 8d5b1bfa2..daccad7e9 100644 --- a/include/rom4.h +++ b/include/rom4.h @@ -120,7 +120,7 @@ bool32 is_c1_link_related_active(void); // c1_overworld_normal // c1_overworld // c2_overworld_basic -// sub_8054398 +void sub_8054398(void); void c2_overworld(void); // set_callback1 // sub_80543DC |