From 397e481f9a3eedf2123cc2fc149468a96b473e88 Mon Sep 17 00:00:00 2001
From: Dragorn421 <Dragorn421@users.noreply.github.com>
Date: Fri, 24 Jun 2022 16:45:05 -0700
Subject: Fix misc 15 (#1298)

* Use `SCENE_` enum more

* Decimal for pos in `D_8011F9B8`

* `__osEventStateTab`: length `OS_NUM_EVENTS + 1` -> `OS_NUM_EVENTS`

* thone -> throne

* `s` on local data

* minor sfxId cleanup

* Run formatter

* Fixup 0x19 + 1 = 0x1A, not 0x20 lol

* Tlut -> TLUT

* DemoKankyo params usage cleanup

* Some proofreading (up to z_actor.c)

* Revert 0 -> sfxId, add todo comment (sfxId=0 is weird apparently)

* `sZdWaterBox` -> `sZorasDomainWaterBox`

* `msgMode == MSGMODE_`, not `GAMEMODE_` (my bad Sadge)
---
 src/code/jpegdecoder.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/code/jpegdecoder.c')

diff --git a/src/code/jpegdecoder.c b/src/code/jpegdecoder.c
index 5261264c7..3301817d0 100644
--- a/src/code/jpegdecoder.c
+++ b/src/code/jpegdecoder.c
@@ -164,11 +164,9 @@ s32 JpegDecoder_ParseNextSymbol(JpegHuffmanTable* hTable, s16* outCoeff, s8* out
 u16 JpegDecoder_ReadBits(u8 len) {
     u8 byteCount;
     u8 data;
-    s32 ret;
+    s32 ret = 0;
     u32 temp;
 
-    ret = 0; // this is required for some reason
-
     for (byteCount = sJpegBitStreamBitIdx >> 3; byteCount > 0; byteCount--) {
         data = sJpegBitStreamPtr[sJpegBitStreamByteIdx++];
         if (sJpegBitStreamDontSkip) {
@@ -184,7 +182,7 @@ u16 JpegDecoder_ReadBits(u8 len) {
         sJpegBitStreamBitIdx -= 8;
     }
 
-    ret = (sJpegBitStreamCurWord << (sJpegBitStreamBitIdx));
+    ret = sJpegBitStreamCurWord << sJpegBitStreamBitIdx;
     temp = ret;
     ret = temp >> -len;
     sJpegBitStreamBitIdx += len;
-- 
cgit v1.2.3