diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-23 10:45:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-23 10:45:19 -0600 |
| commit | e874267edb6617759e239da0fb5cb884867aec6d (patch) | |
| tree | c196c373809a9d60077a890c6ac77ff0515bcf75 /src/unk_transition.c | |
| parent | f1ee374e93d0727074e2c760924b5a89b78aa2b9 (diff) | |
| parent | efa820469afcd92b0fdd6b7fff589143ea63c45c (diff) | |
Merge pull request #469 from DizzyEggg/data
Move some data to C
Diffstat (limited to 'src/unk_transition.c')
| -rw-r--r-- | src/unk_transition.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/unk_transition.c b/src/unk_transition.c index 220570851..7346e06ab 100644 --- a/src/unk_transition.c +++ b/src/unk_transition.c @@ -35,11 +35,13 @@ static bool8 sub_81DB290(struct Task *task); static bool8 sub_81DB328(struct Task *task); // const rom data -// TODO: move those from .s file to .c -extern const u32 gUnknown_0862AD54[]; -extern const u32 gUnknown_0862AF30[]; -extern const u32 gUnknown_0862B0DC[]; -extern const u16 gUnknown_0862B53C[]; +static const u32 gUnknown_0862AD54[] = INCBIN_U32("graphics/battle_transitions/frontier_transition.4bpp.lz"); +static const u32 gUnknown_0862AF30[] = INCBIN_U32("graphics/battle_transitions/frontier_transition.bin"); +static const u32 gUnknown_0862B0DC[] = INCBIN_U32("graphics/battle_transitions/frontier_transition_circles.4bpp.lz"); +static const u16 gUnknown_0862B53C[] = INCBIN_U16("graphics/battle_transitions/frontier_transition.gbapal"); + +// Unused Empty data. Feel free to delete. +static const u8 sFiller[0x1C0] = {0}; static const struct OamData sOamData_862B71C = { |