mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-05-24 23:21:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix misc 15 (#1298)

Browse Source 
* 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)
This commit is contained in:
Dragorn421
2022-06-24 16:45:05 -07:00
committed by GitHub
parent fe7afb9b07
commit 397e481f9a
22 changed files with 60 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/jpegdecoder.c
+2 -4
View File
@@ -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;