diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /src/unk_transition.c | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'src/unk_transition.c')
| -rw-r--r-- | src/unk_transition.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/unk_transition.c b/src/unk_transition.c index 20692bb7c..18cee2544 100644 --- a/src/unk_transition.c +++ b/src/unk_transition.c @@ -36,9 +36,9 @@ static bool8 sub_81DB328(struct Task *task); // const rom data // TODO: move those from .s file to .c -extern const u8 gUnknown_0862AD54[]; -extern const u8 gUnknown_0862AF30[]; -extern const u8 gUnknown_0862B0DC[]; +extern const u32 gUnknown_0862AD54[]; +extern const u32 gUnknown_0862AF30[]; +extern const u32 gUnknown_0862B0DC[]; extern const u16 gUnknown_0862B53C[]; static const struct OamData sOamData_862B71C = |