diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2021-02-14 00:49:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-13 19:49:40 -0500 |
| commit | f9d96d9f73ac090245a518ec04f3fa0e50655d1e (patch) | |
| tree | 9dc905fce276cbfb07a05fc2bf0883bcedddcf23 /src/libultra_code_O2/guS2DInitBg.c | |
| parent | d615ec4f31563b939f8c0dce1c20c79e137c2043 (diff) | |
Fix most compiler warnings in the boot and code segments (#674)
* Less warnings in boot & code segments
* few more warnings gone
* Ran formatter
* z_view warning gone
* -> 1
* f31 -> 31
* Remove function casts
* Few more small improvements
* Separate declaration and assignment in func_80091738 and Item_Give
Co-authored-by: Thar0 <maximilianc64@gmail.com>
Diffstat (limited to 'src/libultra_code_O2/guS2DInitBg.c')
| -rw-r--r-- | src/libultra_code_O2/guS2DInitBg.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libultra_code_O2/guS2DInitBg.c b/src/libultra_code_O2/guS2DInitBg.c index 0d75648f9..d2e5a2b04 100644 --- a/src/libultra_code_O2/guS2DInitBg.c +++ b/src/libultra_code_O2/guS2DInitBg.c @@ -1,13 +1,10 @@ #include "global.h" void guS2DInitBg(uObjBg* bg) { - u16 shift; u32 size; - s32 tmem; + s32 tmem = (bg->b.imageFmt == G_IM_FMT_CI) ? 0x100 : 0x200; + u16 shift = (6 - bg->b.imageSiz); - tmem = (bg->b.imageFmt == G_IM_FMT_CI) ? 0x100 : 0x200; - - shift = (6 - bg->b.imageSiz); if (bg->b.imageLoad == G_BGLT_LOADBLOCK) { bg->b.tmemW = bg->b.imageW >> shift; bg->b.tmemH = (tmem / bg->b.tmemW) * 4; |