diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-12 10:12:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 10:12:37 -0400 |
| commit | 6001e107993d1da69decdf479abf8a661ad57dda (patch) | |
| tree | 9a430f0b70e0a24965378724f1bd28cd1a193dc1 /src/util.c | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
| parent | 7a562d6bae78fd7c62ed2f804fd8dcc555d85d18 (diff) | |
Merge pull request #321 from PikalaxALT/modern_gcc
Get pokefirered_modern to build
Diffstat (limited to 'src/util.c')
| -rw-r--r-- | src/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util.c b/src/util.c index b32799584..5423e0a2d 100644 --- a/src/util.c +++ b/src/util.c @@ -120,13 +120,13 @@ u8 CreateInvisibleSpriteWithCallback(void (*callback)(struct Sprite *)) return sprite; } -void StoreWordInTwoHalfwords(u16 *h, u32 w) +void StoreWordInTwoHalfwords(u16 *h, unsigned w) { h[0] = (u16)(w); h[1] = (u16)(w >> 16); } -void LoadWordFromTwoHalfwords(u16 *h, u32 *w) +void LoadWordFromTwoHalfwords(u16 *h, unsigned *w) { *w = h[0] | (s16)h[1] << 16; } |