diff --git a/papermario/src/code_dc470_len_14c0.c b/papermario/src/code_dc470_len_14c0.c index 817d02619d..386df3c333 100644 --- a/papermario/src/code_dc470_len_14c0.c +++ b/papermario/src/code_dc470_len_14c0.c @@ -38,7 +38,7 @@ u16 read_background_size(bg_header *bg) { gameStatus->unk_14C = bg->startY; gameStatus->unk_154 = bg->palette; gameStatus->unk_158 = bg->raster; - gameStatus->unk_148 = gameStatus->unk_148 | 1; + gameStatus->unk_148 |= 1; return; } @@ -59,8 +59,8 @@ u16 func_80145E98(s32 arg0, s32 arg1, s32 arg2) { if (temp_lo < 0) { temp_lo = temp_lo + 0xFF; } - temp_lo = arg0 + (temp_lo >> 0x08); - return temp_lo & 0xFFFF; + temp_lo = arg0 + (temp_lo >> 8); + return temp_lo; } INCLUDE_ASM(code_dc470_len_14c0, func_80145EC0); diff --git a/papermario/src/code_ebd0_len_6a0.c b/papermario/src/code_ebd0_len_6a0.c index 44e6ce7d48..255a69c5e0 100644 --- a/papermario/src/code_ebd0_len_6a0.c +++ b/papermario/src/code_ebd0_len_6a0.c @@ -17,7 +17,7 @@ s16 func_800337F8(subtract_val) { game_status* gameStatus = *gGameStatusPtr; if (gameStatus->boot_alpha != 0) { gameStatus->boot_alpha -= subtract_val; - if (gameStatus->boot_alpha << 0x10 < 0) { + if (gameStatus->boot_alpha << 16 < 0) { gameStatus->boot_alpha = 0; } } else {